diff --git a/app/multi-server/controllers/multi-server-controller.html b/app/multi-server/controllers/multi-server-controller.html
index 3d56e4e..c477ba8 100644
--- a/app/multi-server/controllers/multi-server-controller.html
+++ b/app/multi-server/controllers/multi-server-controller.html
@@ -6,7 +6,7 @@
 	<section class="row column">
 		<div class="page-header">
 			<h2 class="inline h4">All auto-discovered and manually added servers</h2>
-			<a class="inline float-right" ng-click="multi_server_add = !multi_server_add"><span class="icon icon__plus"></span>Add a server</a>
+			<a class="inline float-right" ng-click="addServer()"><span class="icon icon__plus"></span>Add a server</a>
 		</div>
 	</section>
 	<section class="row column">
@@ -28,8 +28,8 @@
 			<div class="column large-12 header__actions-bar">
 				<div class="inline multi-server__col multi-server__title">Server name<span class="sort-heading"></span></div>
 				<div class="inline multi-server__col">BMC IP address<span class="sort-heading"></span></div>
-				<div class="inline multi-server__col">Model number<span class="sort-heading" ng-class="sort-down"></span></div>
-				<div class="inline multi-server__col narrow-col">Power<span class="sort-heading" ng-class="sort-up"></span></div>
+				<div class="inline multi-server__col">Model number<span class="sort-heading sort-down"></span></div>
+				<div class="inline multi-server__col narrow-col">Power<span class="sort-heading sort-up"></span></div>
 				<div class="inline multi-server__col narrow-col">Status<span class="sort-heading"></span></div>
 			</div>
 		</div>
diff --git a/app/multi-server/controllers/multi-server-controller.js b/app/multi-server/controllers/multi-server-controller.js
index 6bd8783..7046f7b 100644
--- a/app/multi-server/controllers/multi-server-controller.js
+++ b/app/multi-server/controllers/multi-server-controller.js
@@ -49,6 +49,9 @@
                         }
                     }
                 };
+                $scope.addServer = function(){
+                    $scope.multi_server_add = ! $scope.multi_server_add
+                }
             }
         ]
     );
diff --git a/app/multi-server/controllers/multi-server-recent-controller.html b/app/multi-server/controllers/multi-server-recent-controller.html
index 0abd388..70f99a2 100644
--- a/app/multi-server/controllers/multi-server-recent-controller.html
+++ b/app/multi-server/controllers/multi-server-recent-controller.html
@@ -1,5 +1,5 @@
 <div class="multi-server__recent" ng-class="{'active': multi_server_recent}">
-	<a class="multi-server__add-server"><span class="icon icon__plus"></span>Add a server</a>
+	<a class="multi-server__add-server" ng-click="addServer()"><span class="icon icon__plus"></span>Add a server</a>
 	<a href="#/multi-server/overview" ng-click="multiRecent()" class="multi-server__view-all">View all servers (12)<i class="icon icon-angle float-right"></i></a>
 	<div class="multi-server__recent-header">Recently accessed servers</div>
 	<!-- recent server-->