diff --git a/static/ng/resources/js/components/modal-dialog/modal-dialog.directive.html b/static/ng/resources/js/components/modal-dialog/modal-dialog.directive.html
index 413b00513..403aa6345 100644
--- a/static/ng/resources/js/components/modal-dialog/modal-dialog.directive.html
+++ b/static/ng/resources/js/components/modal-dialog/modal-dialog.directive.html
@@ -8,8 +8,8 @@
       <div class="modal-body">
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">// 'close' | tr //</button>
         <button type="button" class="btn btn-primary" id="btnOk">// 'ok' | tr //</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">// 'close' | tr //</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
diff --git a/static/ng/resources/js/components/project-member/add-project-member.directive.html b/static/ng/resources/js/components/project-member/add-project-member.directive.html
index 79cf99dcc..55a226a17 100644
--- a/static/ng/resources/js/components/project-member/add-project-member.directive.html
+++ b/static/ng/resources/js/components/project-member/add-project-member.directive.html
@@ -24,8 +24,8 @@
     <div class="col-xs-2 col-md-2"> 
       <form>                        
         <div class="form-group">               
-          <button type="button" class="btn btn-default" id="btnCancel" ng-click="vm.cancel(form)">// 'cancel' | tr //</button>
           <button type="button" class="btn btn-primary" id="btnSave" ng-disabled="form.$invalid" ng-click="vm.save(pm)">// 'save' | tr //</button>     
+          <button type="button" class="btn btn-default" id="btnCancel" ng-click="vm.cancel(form)">// 'cancel' | tr //</button>
         </div>
       </form>
     </div>
diff --git a/static/ng/resources/js/components/project/add-project.directive.html b/static/ng/resources/js/components/project/add-project.directive.html
index 83686659e..7202199f4 100644
--- a/static/ng/resources/js/components/project/add-project.directive.html
+++ b/static/ng/resources/js/components/project/add-project.directive.html
@@ -19,8 +19,8 @@
     <div class="col-xs-2 col-md-2"> 
       <form>                        
         <div class="form-group">               
-          <button type="button" class="btn btn-default" ng-click="vm.cancel(form)">// 'cancel' | tr //</button>
           <button type="button" class="btn btn-primary" ng-disabled="form.$invalid" ng-click="vm.addProject(p)">// 'save' | tr //</button>     
+          <button type="button" class="btn btn-default" ng-click="vm.cancel(form)">// 'cancel' | tr //</button>
         </div>
       </form>
     </div>
diff --git a/static/ng/resources/js/layout/navigation/navigation-details.directive.js b/static/ng/resources/js/layout/navigation/navigation-details.directive.js
index 8313c68c8..0372f516f 100644
--- a/static/ng/resources/js/layout/navigation/navigation-details.directive.js
+++ b/static/ng/resources/js/layout/navigation/navigation-details.directive.js
@@ -61,11 +61,11 @@
       });
      
       element.find('a[tag*="' + visited + '"]').addClass('active');
-      element.on('click', click);
+      element.find('a').on('click', click);
       
       function click(event) {
         element.find('a').removeClass('active');
-        $(event.target).not('span').addClass('active');
+        $(event.target).addClass('active');
         ctrl.clickTab();
       }
      
diff --git a/static/ng/resources/js/layout/system-management/system-management.controller.html b/static/ng/resources/js/layout/system-management/system-management.controller.html
index 6fb1e99c6..fec351f46 100644
--- a/static/ng/resources/js/layout/system-management/system-management.controller.html
+++ b/static/ng/resources/js/layout/system-management/system-management.controller.html
@@ -55,8 +55,8 @@
       </div>  
       <div class="form-group">
         <div class="col-md-offset-7 col-md-10">
-          <input type="submit" class="btn btn-default" ng-click="vm.cancel()" value="Cancel">
           <input type="submit" class="btn btn-primary" ng-disabled="form.$invalid" value="Save">                    
+          <input type="submit" class="btn btn-default" ng-click="vm.cancel()" value="Cancel">
         </div>
       </div>          
     </div>
diff --git a/views/ng/account-settings.htm b/views/ng/account-settings.htm
index ac93d7a4b..80b5029d1 100644
--- a/views/ng/account-settings.htm
+++ b/views/ng/account-settings.htm
@@ -104,8 +104,8 @@
               </div>
               <div class="form-group">
                 <div class="col-md-offset-7 col-md-10">
-                  <input type="submit" class="btn btn-default" ng-click="vm.cancel(form)" value="// 'cancel' | tr //">
                   <input type="submit" class="btn btn-primary" ng-disabled="form.$invalid" value="// 'save' | tr //">                    
+                  <input type="submit" class="btn btn-default" ng-click="vm.cancel(form)" value="// 'cancel' | tr //">
                 </div>
               </div>  
               <div class="error-message">