diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
index e33033d4c..2aa7f969c 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -165,18 +165,25 @@ button.z-button {
 
 /* Perspective and planner buttons
 --------------------------------------------------- */
-.planner-icon .z-button-cm {
-   padding: 2px 2px;
+
+.planner-icon, .planner-command {
+   padding: 2px;
 }
 
+.planner-icon .z-button-cm {
+   padding: 2px;
+}
 .planner-icon .z-button-cm:active {
    padding: 2px 1px 1px 2px;
 }
 
-
-.planner-icon {
-   padding: 2px;
+.planner-command .z-button-cm {
+   padding: 6px 2px;
 }
+.planner-command .z-button-cm:active {
+   padding: 6px 1px 1px 6px;
+}
+
 
 .sub_menu .z-button-cm {
     background-color: transparent !important;
@@ -199,11 +206,12 @@ button.z-button {
     background-image: none;
 }
 
+/*
 .plannerlayout .z-button-tl, .plannerlayout .z-button-tm, .plannerlayout .z-button-tr,
 .plannerlayout .z-button-cl, .plannerlayout .z-button-cr,
 .plannerlayout .z-button-bl, .plannerlayout .z-button-bm, .plannerlayout .z-button-br {
     display: visible;
-}
+}*/
 
 /* Global action button styles
 --------------------------------------------------- */
@@ -888,3 +896,7 @@ span.z-dottree-ico, span.z-dottree-line {
 .main-area {
     overflow: auto;
 }
+
+.orderslayout-area {
+    overflow-y: auto;
+}
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 217411e07..5af57178d 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -57,7 +57,7 @@
   <n:tr>
     <n:td height="400px" valign="top">
 
-    <borderlayout width="auto" class="main-layout" if="true" height="450px">
+    <borderlayout width="auto" class="main-layout" if="true" height="560px">
     <west class="perspectives-column" width="90px">
         <n:div>
         <vbox id="registeredItemsInsertionPoint" width="90px"/>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
index 7bc6dbac6..82ea199b2 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
@@ -26,10 +26,37 @@
     orderController = arg.get("orderController");
 ]]>
 </zscript>
-    <window apply="${orderController}">
-        <vbox id="messagesContainer" />
-        <list top_id="listWindow" />
-        <edition top_id="editWindow" />
-        <orderElement top_id="editOrderElement" title="${i18n:_('Edit order element')}" />
-    </window>
+    <borderlayout sclass="orderslayout" width="auto" apply="${orderController}">
+       <north height="30px" border="0">
+       <hbox align="center" id="toolbar">
+        <separator/>
+        <button label="Create" tooltiptext="${i18n:_('Create new order')}" class="planner-command"/>
+        <button label="Save" tooltiptext="${i18n:_('Save order')}" class="planner-command" disabled="true"/>
+        <separator/>
+        <hbox align="center" style="margin-left:240px;">
+          <!-- Filter by label -->
+          <label>Filter order elements:</label>
+          <combobox id="cbFilterType" value="${i18n:_('Show all')}"
+                constraint="no empty:${i18n:_('cannot be null or empty')}"
+                readonly="true" >
+              <comboitem label="${i18n:_('Show all')}"
+                    description="${i18n:_('Show all order elements')}" />
+              <comboitem label="${i18n:_('Filter by Label')}"
+                    description="${i18n:_('Filter all order elements by label')}" />
+          </combobox>
+          <bandboxSearch id="bdFilter" finder="LabelBandboxFinder"/>
+          <button label="${i18n:_('Filter')}" class="planner-command"/>
+          </hbox>
+       </hbox>
+       </north>
+
+        <center border="0" class="orderslayout-area">
+        <div>
+            <vbox id="messagesContainer" />
+            <list top_id="listWindow" />
+            <edition top_id="editWindow" />
+            <orderElement top_id="editOrderElement" title="${i18n:_('Edit order element')}" />
+            </div>
+        </center>
+        </borderlayout>
 </zk>
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index 4b6da7e93..3cf28211b 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -545,6 +545,10 @@ div.z-tree {
 .plannerlayout, .resourcesloadlayout, .advancedallocationlayout {
     height:550px;
 }
+.orderslayout {
+    height:550px;
+}
+
 
 .task_tooltip {
     display:none;