diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
index 8b043d1e44..229cd17ba6 100644
--- a/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
+++ b/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
@@ -6,7 +6,7 @@
 {% include "projecttopbar.html" %}
 
 <!-- Begin main page container -->
-<div class="row-fluid">
+<div>
     {% block projectinfomain %}{% endblock %}
 </div>
 <!-- End main container -->
diff --git a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
index f1db2f1504..df809de405 100644
--- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
+++ b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
@@ -21,8 +21,7 @@
     });
 </script>
 
-    <div class="page-header">
-      <h1>
+      <h2>
         {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %}
             {{objects.paginator.count}} build{{objects.paginator.count|pluralize}} found
         {%elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
@@ -31,8 +30,7 @@
             Project builds
         {%endif%}
         <i class="icon-question-sign get-help heading-help" title="This page lists all the builds for the current project"></i>
-      </h1>
-    </div>
+      </h2>
 
 
  {% if objects.paginator.count == 0 %}
diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
index 7412e4c2b4..ca2741daf9 100644
--- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
+++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
@@ -17,7 +17,7 @@
   </form>
 </div>
 
-<div class="row-fluid" id="project-topbar">
+<div id="project-topbar">
   <ul class="nav nav-pills">
     <li>
       <a href="{% url 'projectbuilds' project.id %}">
@@ -34,24 +34,14 @@
         Import layer
       </a>
     </li>
-    <!-- Coming soon
-    <li>
-      <a href="my-image-recipes.html">
-        My image recipes
-      </a>
-    </li>
-    -->
     <li class="pull-right">
-
-        <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to the recipe name, like so: <code>busybox:clean</code>">
-        </i>
+      <form class="form-inline" style="margin-bottom:0px;">
+        <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a semicolon and a task name to the recipe name, like so: <code>busybox:clean</code>"></i>
         <div class="input-append">
-          <form class="form-inline" style="margin-bottom: 0">
-            <input id="build-input" type="text" class="input-xlarge input-lg build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled>
-              <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build
-              </button>
-            </form>
-          </div>
-        </li>
-      </ul>
+          <input id="build-input" type="text" class="input-xlarge input-lg build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled>
+          <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build</button>
+        </div>
+      </form>
+    </li>
+  </ul>
 </div>