diff --git a/openstack-dashboard/dashboard/templates/syspanel_base.html b/openstack-dashboard/dashboard/templates/syspanel_base.html
index 0e88f09b9..9607c87d8 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_base.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_base.html
@@ -11,22 +11,8 @@
 
 {% block main %}
   {% block page_header %}
-    <div id='page_header'>
-      <h2>{% block page_title %}{% endblock %}</h2>
-      <div class="right">
-        <div class='search'>
-          <form action='' method='post'>
-            <fieldset>
-              <label for='table_search'>Search</label>
-              <input id='table_search' name='search' type='text' value='' />
-            </fieldset>
-          </form>
-        </div>
-        <a class="refresh" title="Refresh" href="{% block refresh_link %}{% endblock refresh_link %}">Refresh List</a>
-      </div>
-      
-    </div>
   {% endblock %}
+
   {% include "_messages.html" %}
   
   <div class='main_content'>
diff --git a/openstack-dashboard/dashboard/templates/syspanel_create_flavor.html b/openstack-dashboard/dashboard/templates/syspanel_create_flavor.html
index e7069a429..057cdb11f 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_create_flavor.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_create_flavor.html
@@ -6,19 +6,12 @@
   {% endwith %}
 {% endblock %}
 
-{% block main %}
-  <div id='page_header'>
-   <h2><span>System Panel:</span> Flavors</h2>
-   <p class='desc'><span>&mdash;</span> Create, Edit and Delete Flavors.</p>
-  </div>
-  {% include "_messages.html" %}
+{% block page_header %}
+  {% include "_page_header.html" with title="Create Flavor" %}
+{% endblock page_header %}
 
-  <div class="main_content">
+{% block syspanel_main %}
     <div class="dash_block wide form">
-      <div class='title_block'>
-        <h3>Create Flavor</h3>
-      </div>
-
       <div class="left">
         <ul class='stat_box info small'>
           <li class='block'>
@@ -34,14 +27,11 @@
             <p class='avail'>{{available_disk_tb}}<span class='unit'>TB</span><span class='label'>Available</span></p>
           </li>
         </ul>
-
         {% include "_create_flavor.html" %}
       </div>
-      
       <div class="right">
         <h3>Description:</h3>
         <p>From here you can define the sizing of a new flavor.</p>
       </div>
     </div>
-  </div>
 {% endblock %}
diff --git a/openstack-dashboard/dashboard/templates/syspanel_flavors.html b/openstack-dashboard/dashboard/templates/syspanel_flavors.html
index 4c91d14be..b86a7d07f 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_flavors.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_flavors.html
@@ -6,8 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Flavors{% endblock %}
-{% block refresh_link %}{% url syspanel_flavors %}{% endblock refresh_link %}
+{% block page_header %}
+  {% url syspanel_flavors as refresh_link %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Flavors" refresh_link=refresh_link searchable="true" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   {% include "_syspanel_flavor_list.html" %}
diff --git a/openstack-dashboard/dashboard/templates/syspanel_image_update.html b/openstack-dashboard/dashboard/templates/syspanel_image_update.html
index c0e238293..defc03673 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_image_update.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_image_update.html
@@ -6,8 +6,9 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Update Image{% endblock %}
-{% block refresh_link %}{% url syspanel_images %}{% endblock refresh_link %}
+{% block page_header %}
+  {% include "_page_header.html" with title="Update Image" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <div class="dash_block wide form">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_images.html b/openstack-dashboard/dashboard/templates/syspanel_images.html
index b72b60941..258d5ea0b 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_images.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_images.html
@@ -6,8 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Images{% endblock %}
-{% block refresh_link %}{% url syspanel_images %}{% endblock refresh_link %}
+{% block page_header %}
+  {% url syspanel_images as refresh_link %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Images" refresh_link=refresh_link searchable="true" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   {% include "_syspanel_image_list.html" %}
diff --git a/openstack-dashboard/dashboard/templates/syspanel_instances.html b/openstack-dashboard/dashboard/templates/syspanel_instances.html
index 5cd6604d5..d8ca3ed75 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_instances.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_instances.html
@@ -6,7 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Instances{% endblock %}
+{% block page_header %}
+  {% url syspanel_instances as refresh_link %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Instances" refresh_link=refresh_link searchable="true" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   {% if instances %}
diff --git a/openstack-dashboard/dashboard/templates/syspanel_quotas.html b/openstack-dashboard/dashboard/templates/syspanel_quotas.html
index fb729c3d3..fc8ece637 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_quotas.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_quotas.html
@@ -6,8 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Default Quotas{% endblock %}
-{% block refresh_link %}{% url syspanel_quotas %}{% endblock %}
+{% block page_header %}
+  {% url syspanel_quotas as refresh_link %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Default Quotas" refresh_link=refresh_link searchable="true" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <table class="wide">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_services.html b/openstack-dashboard/dashboard/templates/syspanel_services.html
index 5fdbea0ac..dc193067b 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_services.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_services.html
@@ -6,7 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Services{% endblock %}
+{% block page_header %}
+  {% url syspanel_services as refresh_link %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Services" refresh_link=refresh_link searchable="true" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   {% include "_syspanel_service_list.html" %}
diff --git a/openstack-dashboard/dashboard/templates/syspanel_tenant_create.html b/openstack-dashboard/dashboard/templates/syspanel_tenant_create.html
index b3d61e1dd..3be713132 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_tenant_create.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_tenant_create.html
@@ -6,7 +6,9 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Create Tenant{% endblock %}
+{% block page_header %}
+  {% include "_page_header.html" with title="Create Tenant" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <div class="dash_block wide form">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_tenant_quotas.html b/openstack-dashboard/dashboard/templates/syspanel_tenant_quotas.html
index 84456999a..770240442 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_tenant_quotas.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_tenant_quotas.html
@@ -6,7 +6,9 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Update Tenant Quotas{% endblock %}
+{% block page_header %}
+  {% include "_page_header.html" with title="Update Tenant Quotas" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <div class="dash_block wide form">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_tenant_update.html b/openstack-dashboard/dashboard/templates/syspanel_tenant_update.html
index 3f40f98ac..beed420e7 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_tenant_update.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_tenant_update.html
@@ -6,7 +6,9 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Update Tenant{% endblock %}
+{% block page_header %}
+  {% include "_page_header.html" with title="Update Tenant" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <div class="dash_block wide form">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_tenant_usage.html b/openstack-dashboard/dashboard/templates/syspanel_tenant_usage.html
index 29318a7c0..4d1cff991 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_tenant_usage.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_tenant_usage.html
@@ -6,7 +6,10 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}System Panel Overview{% endblock %}
+{% block page_header %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="System Panel Overview" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <form action="" method="get" id="date_form">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_tenant_users.html b/openstack-dashboard/dashboard/templates/syspanel_tenant_users.html
index 764085990..886bcacdf 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_tenant_users.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_tenant_users.html
@@ -6,7 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Users for Tenant: <span>{{tenant_id}}</span>{% endblock %}
+{% block page_header %}
+  <div id='page_header'>
+    <h2>Users for Tenant: <span>{{tenant_id}}</span></h2>
+  </div>
+{% endblock %}
 
 {% block syspanel_main %}
 <div id="usage">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_tenants.html b/openstack-dashboard/dashboard/templates/syspanel_tenants.html
index 5fd647682..541941335 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_tenants.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_tenants.html
@@ -6,7 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Manage Tenants{% endblock %}
+{% block page_header %}
+  {% url syspanel_tenants as refresh_link %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Tenants" refresh_link=refresh_link searchable="true" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   {% include "_syspanel_tenant_list.html" %}
diff --git a/openstack-dashboard/dashboard/templates/syspanel_usage.html b/openstack-dashboard/dashboard/templates/syspanel_usage.html
index c492f8907..e5ce1fa8e 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_usage.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_usage.html
@@ -10,7 +10,10 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}System Panel Overview{% endblock %}
+{% block page_header %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="System Panel Overview" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
     {% if external_links %}
diff --git a/openstack-dashboard/dashboard/templates/syspanel_user_create.html b/openstack-dashboard/dashboard/templates/syspanel_user_create.html
index 63809d22c..6270e0976 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_user_create.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_user_create.html
@@ -6,7 +6,10 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Create User{% endblock %}
+{% block page_header %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Create User" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <div class="dash_block wide form">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_user_update.html b/openstack-dashboard/dashboard/templates/syspanel_user_update.html
index 313185efc..3c8ba0643 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_user_update.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_user_update.html
@@ -6,7 +6,10 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Update Users{% endblock %}
+{% block page_header %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Update User" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}
   <div class="dash_block wide form">
diff --git a/openstack-dashboard/dashboard/templates/syspanel_users.html b/openstack-dashboard/dashboard/templates/syspanel_users.html
index f3342b565..3cf57efef 100644
--- a/openstack-dashboard/dashboard/templates/syspanel_users.html
+++ b/openstack-dashboard/dashboard/templates/syspanel_users.html
@@ -6,8 +6,11 @@
   {% endwith %}
 {% endblock %}
 
-{% block page_title %}Users{% endblock %}
-{% block refresh_link %}{% url syspanel_users %}{% endblock refresh_link %}
+{% block page_header %}
+  {% url syspanel_users as refresh_link %}
+  {# to make searchable false, just remove it from the include statement #}
+  {% include "_page_header.html" with title="Users" refresh_link=refresh_link searchable="true" %}
+{% endblock page_header %}
 
 {% block syspanel_main %}