diff --git a/navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul b/navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul
index 1cab3660a..a8fb01991 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul
@@ -19,55 +19,63 @@
 
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
-<window id="projectCreationWindow" title="${i18n:_('Create project')}" width="650px">
+<window id="projectCreationWindow"
+        title="${i18n:_('Create project')}"
+        width="650px"
+        closable="true"
+        onClose="self.visible = false; event.stopPropagation();">
+
     <grid id="gridProjectDetails">
-                    <columns>
-                        <column width="130px" />
-                        <column  />
-                    </columns>
-                    <rows>
-                        <row>
-                            <label value="${i18n:_('Name')}" />
-                            <textbox value="@{projectController.order.name}" width="500px"/>
-                        </row>
-                        <row>
-                            <label value="${i18n:_('Code')}" />
-                            <hbox>
-                                <textbox id="txtCode" value="@{projectController.order.code}" width="250px"
-                                    disabled="@{projectController.codeAutogenerated}" />
-                                <checkbox label="${i18n:_('Autogenerated')}"
-                                    checked="@{projectController.codeAutogenerated}"/>
-                            </hbox>
-                        </row>
-                        <row>
-                            <label value="${i18n:_('Starting date')}" />
-                            <datebox id="initDate"
-                                value="@{projectController.order.initDate}" />
-                        </row>
-                        <row>
-                            <label value="${i18n:_('Deadline')}" />
-                            <datebox id="deadline" value="@{projectController.order.deadline}" />
-                        </row>
-                        <row>
-                            <label value="${i18n:_('Customer')}" />
-                            <bandboxSearch id="bdExternalCompanies" widthBandbox="485px" widthListbox="500px"
-                                finder="ExternalCompanyBandboxFinder"
-                                model="@{projectController.externalCompaniesAreClient}"
-                                selectedElement="@{projectController.order.customer}"/>
-                        </row>
-                        <row>
-                            <label value="${i18n:_('Calendar')}" />
-                            <combobox id="calendarCombobox" width="200px"
-                                model="@{projectController.baseCalendars}"
-                                itemRenderer="@{projectController.baseCalendarsComboitemRenderer}"
-                                onSelect="projectController.setBaseCalendar(self.selectedItem.value);" />
-                        </row>
-                    </rows>
+        <columns>
+            <column width="130px" />
+            <column  />
+        </columns>
+        <rows>
+            <row>
+                <label value="${i18n:_('Name')}" />
+                <textbox value="@{projectController.order.name}" width="500px"/>
+            </row>
+            <row>
+                <label value="${i18n:_('Code')}" />
+                <hbox>
+                    <textbox id="txtCode" value="@{projectController.order.code}" width="250px"
+                        disabled="@{projectController.codeAutogenerated}" />
+                    <checkbox label="${i18n:_('Autogenerated')}"
+                        checked="@{projectController.codeAutogenerated}"/>
+                </hbox>
+            </row>
+            <row>
+                <label value="${i18n:_('Starting date')}" />
+                <datebox id="initDate"
+                    value="@{projectController.order.initDate}" />
+            </row>
+            <row>
+                <label value="${i18n:_('Deadline')}" />
+                <datebox id="deadline" value="@{projectController.order.deadline}" />
+            </row>
+            <row>
+                <label value="${i18n:_('Customer')}" />
+                <bandboxSearch id="bdExternalCompanies" widthBandbox="485px" widthListbox="500px"
+                    finder="ExternalCompanyBandboxFinder"
+                    model="@{projectController.externalCompaniesAreClient}"
+                    selectedElement="@{projectController.order.customer}"/>
+            </row>
+            <row>
+                <label value="${i18n:_('Calendar')}" />
+                <combobox id="calendarCombobox" width="200px"
+                    model="@{projectController.baseCalendars}"
+                    itemRenderer="@{projectController.baseCalendarsComboitemRenderer}"
+                    onSelect="projectController.setBaseCalendar(self.selectedItem.value);" />
+            </row>
+        </rows>
     </grid>
+
+    <!-- Control buttons -->
     <hbox>
-            <button label="${i18n:_('Accept')}" onClick="projectController.accept();"
-                sclass="save-button global-action" />
-            <button label="${i18n:_('Cancel')}" onClick="projectController.cancel();"
-                sclass="cancel-button global-action" />
+        <button label="${i18n:_('Accept')}" onClick="projectController.accept();"
+            sclass="save-button global-action" />
+        <button label="${i18n:_('Cancel')}" onClick="projectController.cancel();"
+            sclass="cancel-button global-action" />
     </hbox>
-</window>
\ No newline at end of file
+
+</window>