diff --git a/libreplan-webapp/src/main/webapp/orders/_edition.zul b/libreplan-webapp/src/main/webapp/orders/_edition.zul
index 4f5c88781..6223c8fdd 100644
--- a/libreplan-webapp/src/main/webapp/orders/_edition.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_edition.zul
@@ -62,13 +62,13 @@
                 <orderElementTree id="orderElementTree" showCreateTemplateButton="true" />
             </tabpanel>
             <tabpanel id="tabPanelGeneralData" fulfill="tabGeneralData.onSelect">
-             <hbox>
-                <groupbox style="margin-top: 5px" sclass="assignedresources" closable="false">
+             <hbox width="100%">
+                <groupbox style="margin-top: 5px" sclass="assignedresources" closable="false" hflex="1">
                     <caption label="${i18n:_('Identification')}" />
 
                     <separator spacing="10px"/>
 
-                    <grid fixedLayout="true" width="550px">
+                    <grid fixedLayout="true" hflex="1">
                         <columns>
                             <column width="200px" />
                             <column  />
@@ -76,13 +76,13 @@
                         <rows>
                             <row>
                                 <label value="${i18n:_('Name')}" />
-                                <textbox value="@{controller.order.name}" width="500px"
+                                <textbox value="@{controller.order.name}" hflex="1"
                                     constraint="@{controller.chekValidProjectName}" />
                             </row>
                             <row>
                                 <label value="${i18n:_('Code')}" />
                                 <hbox>
-                                    <textbox value="@{controller.order.code}" width="250px"
+                                    <textbox value="@{controller.order.code}" hflex="1"
                                         disabled="@{controller.codeAutogenerated}"
                                         constraint="@{controller.chekValidProjectCode}" />
                                     <checkbox label="${i18n:_('Generate code')}"
@@ -94,13 +94,13 @@
                                 <textbox
                                     value="@{controller.order.responsible}" width="200px"/>
                             </row>
-			                <row>
+                            <row>
                                 <label value="${i18n:_('Description')}" />
                                 <textbox
                                     value="@{controller.order.description}"
                                     rows="7" width="330px" />
                             </row>
-			                <row>
+                            <row>
                                 <label value="${i18n:_('State')}" />
                                 <listbox id="listOrderStatus" mold="select" rows="1" width="220px"
                                     model="@{controller.orderStatus}"
@@ -110,8 +110,9 @@
                         </rows>
                     </grid>
                 </groupbox>
-                <div>
-                <groupbox style="margin-top: 5px" sclass="assignedresources" closable="false">
+
+                <vbox hflex="1">
+                <groupbox style="margin-top: 5px" sclass="assignedresources" closable="false" hflex="1">
                     <caption label="${i18n:_('Planning Configuration')}" />
 
                     <separator spacing="10px"/>
@@ -140,7 +141,7 @@
                                     itemRenderer="@{controller.baseCalendarsComboitemRenderer}"
                                     onSelect="controller.setBaseCalendar(self.selectedItem.value);" />
                             </row>
-			                <row>
+                            <row>
                                 <label value="${i18n:_('Scheduling mode')}" />
                                 <combobox id="schedulingMode" />
                             </row>
@@ -197,30 +198,30 @@
                         </rows>
                     </grid>
                 </groupbox>
-                </div>
+                </vbox>
                 </hbox>
                 <groupbox style="margin-top: 5px" sclass="assignedresources" closable="false">
                    <caption label="${i18n:_('Customer information')}" />
                    <separator spacing="10px"/>
-                   <hbox>
-                       <separator spacing="10px"/>
+                   <hbox width="100%">
+                       <separator spacing="10px" width="100%"/>
 
-                       <grid fixedLayout="true">
+                       <grid fixedLayout="true" hflex="1">
                            <columns>
                                <column width="200px" />
                                <column  />
                            </columns>
                            <rows>
-			                   <row>
+                               <row>
                                   <label value="${i18n:_('Project type')}" />
                                   <label value="@{controller.projectType}" width="350px"/>
                                </row>
-			                   <row>
+                               <row>
                                   <label value="${i18n:_('External code')}" />
                                   <textbox value="@{controller.order.externalCode}"
                                       width="350px" disabled="true"/>
                                </row>
-			                   <row>
+                               <row>
                                    <label value="${i18n:_('Customer')}" />
                                    <bandboxSearch id="bdExternalCompanies" widthBandbox="355px" widthListbox="370px"
                                        finder="ExternalCompanyBandboxFinder"
@@ -238,12 +239,12 @@
 
                        <separator spacing="20px"/>
                        <groupbox style="margin-top: 5px" sclass="assignedresources" closable="false"
-                           visible="@{controller.subcontractedProject}">
+                           visible="@{controller.subcontractedProject}" hflex="1">
                        <caption label="${i18n:_('Delivery dates requested by the customer. ')}" />
                        <grid id="gridDeliveryDates"
                             model="@{controller.deliverDates}"
-	                        mold="paging" pageSize="4" fixedLayout="true" width="400px"
-	                        onInitRender="controller.setCurrentDeliveryDate(self);">
+                            mold="paging" pageSize="4" fixedLayout="true" width="400px"
+                            onInitRender="controller.setCurrentDeliveryDate(self);">
                             <columns>
                                 <column label="${i18n:_('Delivery date')}" align="center" width="200px"/>
                                 <column label="${i18n:_('Communication date')}" align="center"/>
@@ -255,7 +256,7 @@
                                 </row>
                             </rows>
                         </grid>
-					   </groupbox>
+                        </groupbox>
                      </hbox>
                      <separator spacing="20px"/>
                      <groupbox style="margin-top: 5px" sclass="assignedresources" closable="false"
@@ -270,7 +271,7 @@
                        <separator spacing="10px"/>
                        <grid id="gridAskedEndDates" model="@{controller.endDates}"
                           rowRenderer="@{controller.endDatesRenderer}"
-	                      mold="paging" pageSize="10" fixedLayout="true" width="880px">
+                          mold="paging" pageSize="10" fixedLayout="true" width="880px">
                           <columns>
                               <column label="${i18n:_('Save date')}" sort="auto(saveDate)" align="center" width="220px"/>
                               <column label="${i18n:_('End date')}" align="center" width="220px"/>