diff --git a/ansibleworks/ui/static/js/controllers/Authentication.js b/ansibleworks/ui/static/js/controllers/Authentication.js
index 9dc89afacd..8d4b77bf63 100644
--- a/ansibleworks/ui/static/js/controllers/Authentication.js
+++ b/ansibleworks/ui/static/js/controllers/Authentication.js
@@ -25,12 +25,19 @@ function Authenticate($scope, $rootScope, $location, Authorization, ToggleClass,
    $scope.sessionExpired = Authorization.didSessionExpire();    //Display session timeout message
    $scope.sessionTimeout = ($AnsibleConfig.session_timeout / 60).toFixed(2)
 
+   $('#login-password').bind('keypress', function(e) {
+       var code = (e.keyCode ? e.keyCode : e.which);
+       if (code == 13) {
+          $('#login-button').click();
+       }
+       });
+
    // Display the login dialog
    $('#login-modal').modal({ show: true, keyboard: false, backdrop: false });
- 
+
    $scope.reset = function() { 
-      $('#login-form input').each( function(index) { $(this).val(''); });
-      };
+       $('#login-form input').each( function(index) { $(this).val(''); });
+       };
 
    // Call the API to get an auth token
    $scope.systemLogin = function(username, password) {
@@ -70,5 +77,5 @@ function Authenticate($scope, $rootScope, $location, Authorization, ToggleClass,
                 $('#alert-modal').modal({ show: true, keyboard: true,  backdrop: 'static' });
              }
              });
-    }
+       }
 }
diff --git a/ansibleworks/ui/static/js/forms/JobEvents.js b/ansibleworks/ui/static/js/forms/JobEvents.js
index 776ffb9c49..773af8a342 100644
--- a/ansibleworks/ui/static/js/forms/JobEvents.js
+++ b/ansibleworks/ui/static/js/forms/JobEvents.js
@@ -21,7 +21,7 @@ angular.module('JobEventFormDefinition', [])
                 readonly: true,
                 class: 'span2'
                 },
-            event: {
+            event_display: {
                 label: 'Event',
                 type: 'text',
                 readonly: true
diff --git a/ansibleworks/ui/static/js/forms/Jobs.js b/ansibleworks/ui/static/js/forms/Jobs.js
index cb12196813..8040a10d78 100644
--- a/ansibleworks/ui/static/js/forms/Jobs.js
+++ b/ansibleworks/ui/static/js/forms/Jobs.js
@@ -154,7 +154,8 @@ angular.module('JobFormDefinition', [])
                 type: 'textarea', 
                 readonly: true,
                 rows: 10,
-                class: 'span12'
+                class: 'span12',
+                ngShow: "result_traceback != ''"
                 }
             },
 
@@ -169,7 +170,7 @@ angular.module('JobFormDefinition', [])
                 },
             summary: {
                 label: 'Hosts',
-                icon: 'icon-filter',
+                icon: 'icon-th-large',
                 ngClick: "jobSummary()",
                 class: 'btn-info btn-small',
                 awToolTip: 'View host summary',
@@ -180,7 +181,7 @@ angular.module('JobFormDefinition', [])
                 icon: 'icon-list-ul',
                 ngClick: "jobEvents()",
                 class: 'btn-info btn-small',
-                awToolTip: 'View job events',
+                awToolTip: 'Edit job events',
                 mode: 'all',             
                 }
             },
diff --git a/ansibleworks/ui/static/js/lists/Credentials.js b/ansibleworks/ui/static/js/lists/Credentials.js
index fa8295547f..be3e504a54 100644
--- a/ansibleworks/ui/static/js/lists/Credentials.js
+++ b/ansibleworks/ui/static/js/lists/Credentials.js
@@ -58,7 +58,7 @@ angular.module('CredentialsListDefinition', [])
                 ngClick: "editCredential(\{\{ credential.id \}\})",
                 icon: 'icon-edit',
                 label: 'Edit',
-                class: 'btn-small',
+                class: 'btn-small btn-success',
                 awToolTip: 'View/Edit credential'
                 },
 
diff --git a/ansibleworks/ui/static/js/lists/Groups.js b/ansibleworks/ui/static/js/lists/Groups.js
index 852de6fb2a..43fd4ee290 100644
--- a/ansibleworks/ui/static/js/lists/Groups.js
+++ b/ansibleworks/ui/static/js/lists/Groups.js
@@ -43,7 +43,7 @@ angular.module('GroupListDefinition', [])
                 label: 'Edit',
                 ngClick: "editGroup(\{\{ group.id \}\})",
                 icon: 'icon-edit',
-                class: 'btn-small',
+                class: 'btn-small btn-success',
                 awToolTip: 'View/Edit group'
                 },
 
diff --git a/ansibleworks/ui/static/js/lists/Hosts.js b/ansibleworks/ui/static/js/lists/Hosts.js
index 24a6ea7e9c..3e6cc471c5 100644
--- a/ansibleworks/ui/static/js/lists/Hosts.js
+++ b/ansibleworks/ui/static/js/lists/Hosts.js
@@ -42,7 +42,7 @@ angular.module('HostListDefinition', [])
             edit: {
                 label: 'Edit',
                 ngClick: "editHost(\{\{ host.id \}\})",
-                icon: 'icon-edit',
+                icon: 'icon-edit btn-success',
                 class: 'btn-small',
                 awToolTip: 'View/Edit host'
                 },
diff --git a/ansibleworks/ui/static/js/lists/Inventories.js b/ansibleworks/ui/static/js/lists/Inventories.js
index 1c1a049c98..c6fa596f89 100644
--- a/ansibleworks/ui/static/js/lists/Inventories.js
+++ b/ansibleworks/ui/static/js/lists/Inventories.js
@@ -49,7 +49,7 @@ angular.module('InventoriesListDefinition', [])
                 label: 'Edit',
                 ngClick: "editInventory(\{\{ inventory.id \}\})",
                 icon: 'icon-edit',
-                class: 'btn-small',
+                class: 'btn-small btn-success',
                 awToolTip: 'View/Edit inventory'
                 },
 
diff --git a/ansibleworks/ui/static/js/lists/JobEvents.js b/ansibleworks/ui/static/js/lists/JobEvents.js
index 9920810d46..3e8afcaac8 100644
--- a/ansibleworks/ui/static/js/lists/JobEvents.js
+++ b/ansibleworks/ui/static/js/lists/JobEvents.js
@@ -23,7 +23,7 @@ angular.module('JobEventsListDefinition', [])
                 desc: true,
                 searchType: 'int'   
                 },
-            event: {
+            event_display: {
                 label: 'Event',
                 link: true
                 },
@@ -57,16 +57,16 @@ angular.module('JobEventsListDefinition', [])
                 mode: 'all'
                 },
             edit: {
-                label: 'View',
+                label: 'Edit',
                 ngClick: "jobDetails()",
                 icon: 'icon-edit',
                 class: 'btn-small btn-success',
-                awToolTip: 'View/Edit detail',
+                awToolTip: 'Edit job details',
                 mode: 'all'
                 },
             summary: {
                 label: 'Hosts',
-                icon: 'icon-filter',
+                icon: 'icon-th-large',
                 ngClick: "jobSummary()",
                 class: 'btn-info btn-small',
                 awToolTip: 'View host summary',
@@ -78,9 +78,9 @@ angular.module('JobEventsListDefinition', [])
             edit: {
                 label: 'View',
                 ngClick: "editJobEvent(\{\{ jobevent.id \}\})",
-                icon: 'icon-edit',
+                icon: 'icon-zoom-in',
                 class: 'btn-small',
-                awToolTip: 'View event detail',
+                awToolTip: 'View event details',
                 },
             }
         });
diff --git a/ansibleworks/ui/static/js/lists/JobHosts.js b/ansibleworks/ui/static/js/lists/JobHosts.js
index 3f9ec0dbc7..efc66b2ce6 100644
--- a/ansibleworks/ui/static/js/lists/JobHosts.js
+++ b/ansibleworks/ui/static/js/lists/JobHosts.js
@@ -62,11 +62,11 @@ angular.module('JobHostDefinition', [])
                 mode: 'all'
                 },
             edit: {
-                label: 'View',
+                label: 'Edit',
                 icon: 'icon-edit',
                 ngClick: "jobDetails()",
                 class: 'btn-success btn-small',
-                awToolTip: 'View job detail',
+                awToolTip: 'Edit job details',
                 mode: 'all'
                 },
             events: {
diff --git a/ansibleworks/ui/static/js/lists/JobTemplates.js b/ansibleworks/ui/static/js/lists/JobTemplates.js
index 9903a5a4e1..c2cec40e82 100644
--- a/ansibleworks/ui/static/js/lists/JobTemplates.js
+++ b/ansibleworks/ui/static/js/lists/JobTemplates.js
@@ -44,8 +44,8 @@ angular.module('JobTemplatesListDefinition', [])
                 label: 'Edit',
                 ngClick: "editJobTemplate(\{\{ job_template.id \}\})",
                 icon: 'icon-edit',
-                awToolTip: 'View/Edit template',
-                class: 'btn-small'
+                awToolTip: 'Edit template',
+                class: 'btn-small btn-success'
                 },
             submit: {
                 label: 'Launch',
@@ -53,7 +53,7 @@ angular.module('JobTemplatesListDefinition', [])
                 mode: 'all',
                 class: 'btn-small btn-success',
                 ngClick: 'submitJob(\{\{ job_template.id \}\})',
-                awToolTip: 'Create and run a job using this template'     
+                awToolTip: 'Start a job using this template'     
                 },
             delete: {
                 label: 'Delete',
diff --git a/ansibleworks/ui/static/js/lists/Jobs.js b/ansibleworks/ui/static/js/lists/Jobs.js
index ec0fa4ebf5..29088fc733 100644
--- a/ansibleworks/ui/static/js/lists/Jobs.js
+++ b/ansibleworks/ui/static/js/lists/Jobs.js
@@ -62,14 +62,14 @@ angular.module('JobsListDefinition', [])
         fieldActions: {
             edit: {
                 icon: 'icon-edit',
-                label: 'View',
+                label: 'Edit',
                 ngClick: "editJob(\{\{ job.id \}\}, '\{\{ job.name \}\}')",
                 class: 'btn-success btn-small',
-                awToolTip: 'View/Edit detail',
+                awToolTip: 'Edit job details',
                 },
             summary: {
                 label: 'Hosts',
-                icon: 'icon-filter',
+                icon: 'icon-th-large',
                 ngClick: "viewSummary(\{{ job.id \}\}, '\{\{ job.name \}\}')",
                 class: 'btn-info btn-small',
                 awToolTip: 'View host summary',
diff --git a/ansibleworks/ui/static/js/lists/Organizations.js b/ansibleworks/ui/static/js/lists/Organizations.js
index 1fe83f9101..6a080cb65c 100644
--- a/ansibleworks/ui/static/js/lists/Organizations.js
+++ b/ansibleworks/ui/static/js/lists/Organizations.js
@@ -42,7 +42,7 @@ angular.module('OrganizationListDefinition', [])
                 label: 'Edit',
                 ngClick: "editOrganization(\{\{ organization.id \}\})",
                 icon: 'icon-edit',
-                class: 'btn-small',
+                class: 'btn-small btn-success',
                 awToolTip: 'View/Edit organization'
                 },
 
diff --git a/ansibleworks/ui/static/js/lists/Projects.js b/ansibleworks/ui/static/js/lists/Projects.js
index 45c3c381b0..9948292f75 100644
--- a/ansibleworks/ui/static/js/lists/Projects.js
+++ b/ansibleworks/ui/static/js/lists/Projects.js
@@ -43,7 +43,7 @@ angular.module('ProjectsListDefinition', [])
                 label: 'Edit',
                 ngClick: "editProject(\{\{ project.id \}\})",
                 icon: 'icon-edit',
-                class: 'btn-small',
+                class: 'btn-small btn-success',
                 awToolTip: 'View/edit project'
                 },
 
diff --git a/ansibleworks/ui/static/js/lists/Teams.js b/ansibleworks/ui/static/js/lists/Teams.js
index 320e3b652f..18826d3824 100644
--- a/ansibleworks/ui/static/js/lists/Teams.js
+++ b/ansibleworks/ui/static/js/lists/Teams.js
@@ -49,7 +49,7 @@ angular.module('TeamsListDefinition', [])
                 label: 'Edit',
                 ngClick: "editTeam(\{\{ team.id \}\})",
                 icon: 'icon-edit',
-                class: 'btn-small',
+                class: 'btn-small btn-success',
                 awToolTip: 'View/Edit team'
                 },
 
diff --git a/ansibleworks/ui/static/js/lists/Users.js b/ansibleworks/ui/static/js/lists/Users.js
index 22699b13cc..3c166d11b4 100644
--- a/ansibleworks/ui/static/js/lists/Users.js
+++ b/ansibleworks/ui/static/js/lists/Users.js
@@ -48,7 +48,7 @@ angular.module('UserListDefinition', [])
                 label: 'Edit',
                 ngClick: "editUser(\{\{ user.id \}\})",
                 icon: 'icon-edit',
-                class: 'btn-small',
+                class: 'btn-small btn-success',
                 awToolTip: 'View/Edit user'
                 },
 
diff --git a/ansibleworks/ui/static/partials/login-dialog.html b/ansibleworks/ui/static/partials/login-dialog.html
index af064a0939..91f6e8551e 100644
--- a/ansibleworks/ui/static/partials/login-dialog.html
+++ b/ansibleworks/ui/static/partials/login-dialog.html
@@ -11,7 +11,7 @@
             <div class="control-group">
               <label class="control-label">Username:</label>
               <div class="controls">
-                <input type="text" name="username" ng-model="username" required><br />
+                <input type="text" name="username" ng-model="username" id="login-username" required><br />
                 <span class="error" ng-show="loginForm.username.$dirty && loginForm.username.$error.required">A value is required!</span>
                 <span class="errora api-error" ng-bind="usernameError"></span>
               </div>
@@ -19,7 +19,7 @@
             <div class="control-group">
               <label class="control-label">Password:</label>
               <div class="controls">
-                <input type="password" name="password" ng-model="password" required><br />
+                <input type="password" name="password" id="login-password" ng-model="password"><br />
                 <span class="error" ng-show="loginForm.password.$dirty && loginForm.password.$error.required">A value is required!</span>
                 <span class="error api-error" ng-bind="passwordError"></span>
               </div>
@@ -29,7 +29,7 @@
         <div class="modal-footer">
           <button ng-click="systemLogin(loginForm.username.$modelValue,loginForm.password.$modelValue)"
                   ng-disabled="loginForm.$invalid || $loginForm.$pristine" 
-                  class="btn btn-primary">Sign In</button>
+                  id="login-button" class="btn btn-primary">Sign In</button>
         </div>
       </div><!-- modal -->