diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index cf612950ef..476075f708 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -9,7 +9,7 @@
 
 function JobDetailController ($location, $rootScope, $scope, $compile, $routeParams, $log, ClearScope, Breadcrumbs, LoadBreadCrumbs, GetBasePath, Wait, Rest,
     ProcessErrors, SelectPlay, SelectTask, Socket, GetElapsed, DrawGraph, LoadHostSummary, ReloadHostSummaryList, JobIsFinished, SetTaskStyles, DigestEvent,
-    UpdateDOM, EventViewer, DeleteJob, PlaybookRun, HostEventsViewer, LoadPlays, LoadTasks, LoadHosts) {
+    UpdateDOM, EventViewer, DeleteJob, PlaybookRun, HostEventsViewer, LoadPlays, LoadTasks, LoadHosts, HostsEdit) {
 
     ClearScope();
 
@@ -1091,10 +1091,22 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
             status: status
         });
     };
+
+    scope.editHost = function(id) {
+        console.log('clicked edit for host: ' + id);
+        HostsEdit({
+            host_scope: scope,
+            group_scope: null,
+            host_id: id,
+            inventory_id: scope.job.inventory,
+            mode: 'edit',  // 'add' or 'edit'
+            selected_group_id: null
+        });
+    };
 }
 
 JobDetailController.$inject = [ '$location', '$rootScope', '$scope', '$compile', '$routeParams', '$log', 'ClearScope', 'Breadcrumbs', 'LoadBreadCrumbs', 'GetBasePath',
     'Wait', 'Rest', 'ProcessErrors', 'SelectPlay', 'SelectTask', 'Socket', 'GetElapsed', 'DrawGraph', 'LoadHostSummary', 'ReloadHostSummaryList',
     'JobIsFinished', 'SetTaskStyles', 'DigestEvent', 'UpdateDOM', 'EventViewer', 'DeleteJob', 'PlaybookRun', 'HostEventsViewer', 'LoadPlays', 'LoadTasks',
-    'LoadHosts'
+    'LoadHosts', 'HostsEdit'
 ];
diff --git a/awx/ui/static/js/helpers/HostEventsViewer.js b/awx/ui/static/js/helpers/HostEventsViewer.js
index 4dd4b55918..18c52a7129 100644
--- a/awx/ui/static/js/helpers/HostEventsViewer.js
+++ b/awx/ui/static/js/helpers/HostEventsViewer.js
@@ -126,6 +126,13 @@ angular.module('HostEventsViewerHelper', ['ModalDialog', 'Utilities', 'EventView
                 var available_height = $('#host-events-modal-dialog').height() - $('#host-events-modal-dialog #search-form').height() - $('#host-events-modal-dialog #fixed-table-header').height();
                 $('#host-events').height(available_height);
                 $log.debug('set height to: ' + available_height);
+                // Check width and reset search fields
+                if ($('#host-events-modal-dialog').width() <= 450) {
+                    $('#host-events-modal-dialog #status-field').css({'margin-left': '7px'});
+                }
+                else {
+                    $('#host-events-modal-dialog #status-field').css({'margin-left': '15px'});
+                }
             };
 
             GetEvents({
diff --git a/awx/ui/static/less/job-details.less b/awx/ui/static/less/job-details.less
index 83d62d8adb..0656219d61 100644
--- a/awx/ui/static/less/job-details.less
+++ b/awx/ui/static/less/job-details.less
@@ -27,10 +27,10 @@
         width: 200px;
         padding-right: 15px;
     }
-    #search-form-input-icons {
+    #search-all-input-icons {
         position: absolute;
-        top: 5px;
-        left: 235px;
+        right: 3px;
+        top: 3px;
         a {
             color: #a9a9a9;
         }
diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html
index 28614807ae..c836938bcf 100644
--- a/awx/ui/static/partials/job_detail.html
+++ b/awx/ui/static/partials/job_detail.html
@@ -228,11 +228,11 @@
                             <div id="hosts-table-detail" class="table-detail" lr-infinite-scroll="hostResultsScrollDown" scroll-threshold="10" time-threshold="500">
                                 <table class="table table-condensed">
                                     <tbody>
-                                        <tr ng-repeat="result in results = (hostResults) track by $index" ng-click="viewHostResults(result.id)">
-                                            <td class="col-lg-1 col-md-1 col-sm1 colxs-2 status-column"><a href="" aw-tool-tip="Event ID: {{ result.id }}<br \>Status: {{ result.status_text }}. Click for details" data-placement="top"><i ng-show="result.status_text != 'Unreachable'" class="fa icon-job-{{ result.status }}"></i><i ng-show="result.status_text == 'Unreachable'" class="fa icon-job-unreachable"></i></a></td>
-                                            <td class="col-lg-6 col-md-6 col-sm-6 col-xs-6 status-column"><a href="" aw-tool-tip="Event ID: {{ result.id }}<br \>Status: {{ result.status_text }}. Click for details" data-placement="top">{{ result.name }}</a></td>
+                                        <tr ng-repeat="result in results = (hostResults) track by $index">
+                                            <td class="col-lg-1 col-md-1 col-sm1 colxs-2 status-column"><a href="" ng-click="viewHostResults(result.id)" aw-tool-tip="Event ID: {{ result.id }}<br \>Status: {{ result.status_text }}. Click for details" data-placement="top"><i ng-show="result.status_text != 'Unreachable'" class="fa icon-job-{{ result.status }}"></i><i ng-show="result.status_text == 'Unreachable'" class="fa icon-job-unreachable"></i></a></td>
+                                            <td class="col-lg-6 col-md-6 col-sm-6 col-xs-6 status-column"><a href="" ng-click="viewHostResults(result.id)" aw-tool-tip="Event ID: {{ result.id }}<br \>Status: {{ result.status_text }}. Click for details" data-placement="top">{{ result.name }}</a></td>
                                             <td class="col-lg-4 col-md-4 col-sm-4 col-xs-3">{{ result.msg }}</td>
-                                            <td class="col-lg-1 col-md-1 col-sm-1 col-xs-1"><a href="" aw-tool-tip="Edit host" data-placement="top"><i class="fa fa-pencil"></i></a></td>
+                                            <td class="col-lg-1 col-md-1 col-sm-1 col-xs-1"><a href="" ng-click="editHost(result.host_id)" aw-tool-tip="Edit host" data-placement="top"><i class="fa fa-pencil"></i></a></td>
                                         </tr>
                                         <tr ng-show="results.length === 0">
                                             <td colspan="4" class="col-lg-12 loading-info">No matching hosts</td>
@@ -311,7 +311,7 @@
                                                 <a href="" ng-click="hostEventsViewer(host.id, host.name, 'changed')" aw-tool-tip="Changed" data-placement="top" ng-hide="host.changed == 0"><span class="badge changed-hosts">{{ host.changed }}</span></a>
                                                 <a href="" ng-click="hostEventsViewer(host.id, host.name, 'unreachable')" aw-tool-tip="Unreachable" data-placement="top" ng-hide="host.unreachable == 0"><span class="badge unreachable-hosts">{{ host.unreachable }}</span></a>
                                                 <a href="" ng-click="hostEventsViewer(host.id, host.name, 'failed')" aw-tool-tip="Failed" data-placement="top" ng-hide="host.failed == 0"><span class="badge failed-hosts">{{ host.failed }}</span></a></td>
-                                            <td class="col-lg-1 col-md-1 col-sm-1 col-xs-1"><a href="" aw-tool-tip="Edit host" data-placement="top"><i class="fa fa-pencil"></i></a></td>
+                                            <td class="col-lg-1 col-md-1 col-sm-1 col-xs-1"><a href="" ng-click="editHost(host.id)" aw-tool-tip="Edit host" data-placement="top"><i class="fa fa-pencil"></i></a></td>
                                         </tr>
                                         <tr ng-show="summaryList.length === 0">
                                             <td colspan="2" class="col-lg-12 loading-info">No matching hosts</td>
@@ -342,13 +342,15 @@
     <div ng-include="'/static/partials/eventviewer.html'"></div>
 
     <div id="host-events-modal-dialog" style="display:none;">
-        <form id="search-form" class="form-inline">
+        <div id="search-form" class="form-inline">
             <div class="form-group" style="position:relative;">
                 <label>Search</label>
-                <input type="text" class="form-control input-sm" id="host-events-search-name" ng-model="host_events_search_name" placeholder="Host name" ng-keypress="searchEventKeyPress($event)" >
-                <div id="search-form-input-icons">
-                    <a class="search-icon" ng-show="!eventsSearchActive" ng-click="searchEvents()"><i class="fa fa-search"></i></a>
-                    <a class="search-icon" ng-show="eventsSearchActive" ng-click="host_events_search_name=''; searchEvents()"><i class="fa fa-times"></i></a>
+                <div class="search-name" style="display:inline-block; position:relative;">
+                    <input type="text" class="form-control input-sm" id="host-events-search-name" ng-model="host_events_search_name" placeholder="Host name" ng-keypress="searchEventKeyPress($event)" >
+                    <div id="search-all-input-icons">
+                        <a class="search-icon" ng-show="!eventsSearchActive" ng-click="searchEvents()"><i class="fa fa-search"></i></a>
+                        <a class="search-icon" ng-show="eventsSearchActive" ng-click="host_events_search_name=''; searchEvents()"><i class="fa fa-times"></i></a>
+                    </div>
                 </div>
             </div>
             <div class="form-group" id="status-field">
@@ -362,7 +364,7 @@
                 </select>
             </div>
             <div class="form-group" id="search-indicator" ng-show="hostViewSearching"><i class="fa fa-lg fa-spin fa-cog"></i></div>
-        </form>
+        </div>
         <!-- lr-infinite-scroll="hostEventsTable" scroll-threshold="10" time-threshold="500" -->
         <div id="host-events-table">
             <table id="fixed-table-header" class="table">
@@ -378,4 +380,6 @@
         </div>
    </div>
 
+   <div id="host-modal-dialog" style="display: none;" class="dialog-content"></div>
+
 </div>