diff --git a/app/js/directives/directive-header.js b/app/js/directives/directive-header.js
index 86b844f2..eab4601b 100755
--- a/app/js/directives/directive-header.js
+++ b/app/js/directives/directive-header.js
@@ -10,7 +10,7 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$window', '$rootSc
       scope.ships = ships;
       scope.allBuilds = Persist.builds;
       scope.buildsList = Object.keys(scope.allBuilds).sort();
-      scope.allComparisons = Persist.comparisons;
+      scope.allComparisons = Object.keys(Persist.comparisons).sort();
       scope.bs = Persist.state;
 
       var win = angular.element($window);   // Angularized window object for event triggering
@@ -57,6 +57,10 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$window', '$rootSc
         });
       };
 
+      scope.cleanedBuildList = function(shipId) {
+        return Object.keys(scope.allBuilds[shipId]);
+      };
+
       scope.openMenu = function(e, menu) {
         e.stopPropagation();
         if (menu == scope.openedMenu) {
@@ -68,6 +72,11 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$window', '$rootSc
           scope.openedMenu = null;
           return;
         }
+
+        if (menu == 'comp') {
+          scope.allComparisons = Object.keys(Persist.comparisons).sort();
+        }
+
         scope.openedMenu = menu;
       };
 
diff --git a/app/views/_header.html b/app/views/_header.html
index 3de7440a..0a9abc64 100755
--- a/app/views/_header.html
+++ b/app/views/_header.html
@@ -22,8 +22,8 @@
       <div class="dbl" >
         <div><ul ng-repeat="shipId in buildsList">
           {{ships[shipId].properties.name}}
-          <li ng-repeat="(name, build) in allBuilds[shipId]">
-            <a ui-sref-active="active" class="name" ui-sref="outfit({shipId:shipId, code:build, bn:name})" ng-bind="name"></a>
+          <li ng-repeat="(i, name) in cleanedBuildList(shipId)">
+            <a ui-sref-active="active" class="name" ui-sref="outfit({shipId:shipId, code:allBuilds[shipId][name], bn:name})" ng-bind="name"></a>
           </li>
         </ul></div>
       </div>
@@ -36,7 +36,7 @@
     </div>
     <div class="menu-list" ng-if="openedMenu=='comp'" ng-click="$event.stopPropagation();" style="white-space: nowrap;">
       <span class="cap" ng-if="!bs.hasComparisons" translate="none created"></span>
-      <a ng-repeat="(name, comp) in allComparisons" ui-sref-active="active" class="block name" ui-sref="compare({name:name})" ng-bind="name"></a>
+      <a ng-repeat="(i, name) in allComparisons" ui-sref-active="active" class="block name" ui-sref="compare({name:name})" ng-bind="name"></a>
       <hr />
       <a ui-sref="compare({name: 'all'})" class="block cap" translate="compare all"></a>
       <a ui-sref="compare({name: null})" class="block cap" translate="create new"></a>