diff --git a/awx/ui/client/src/job-detail/host-event/host-event-modal.partial.html b/awx/ui/client/src/job-detail/host-event/host-event-modal.partial.html
index afcb388360..db106deb1b 100644
--- a/awx/ui/client/src/job-detail/host-event/host-event-modal.partial.html
+++ b/awx/ui/client/src/job-detail/host-event/host-event-modal.partial.html
@@ -25,7 +25,7 @@
 
 			<!-- controls -->
 			<div class="HostEvent-controls">
-				<button ng-show="showPrev()" ng-click="goPrevious()"
+				<button ng-show="showPrev()" ng-click="goPrev()"
 				class="btn btn-sm btn-default">Prev</button>
 				<button ng-show="showNext()"ng-click="goNext()" class="btn btn-sm btn-default">Next</button>
 				<button ui-sref="jobDetail" class="btn btn-sm btn-default" ng-show="true" >Close</button>
diff --git a/awx/ui/client/src/job-detail/host-event/host-event.block.less b/awx/ui/client/src/job-detail/host-event/host-event.block.less
index d3e4451c44..04b25f7419 100644
--- a/awx/ui/client/src/job-detail/host-event/host-event.block.less
+++ b/awx/ui/client/src/job-detail/host-event/host-event.block.less
@@ -9,6 +9,9 @@
 }
 .HostEvent-controls{
 	float: right;
+	button {
+		margin-left: 10px;
+	}
 }
 .HostEvent-status--ok{
 	color: @green;
diff --git a/awx/ui/client/src/job-detail/host-event/host-event.controller.js b/awx/ui/client/src/job-detail/host-event/host-event.controller.js
index a1485f4714..ac46279d0f 100644
--- a/awx/ui/client/src/job-detail/host-event/host-event.controller.js
+++ b/awx/ui/client/src/job-detail/host-event/host-event.controller.js
@@ -44,7 +44,7 @@
  			$state.go('jobDetail.host-event.details', {eventId: id})
  		};
 
- 		$scope.goPrevious = function(){
+ 		$scope.goPrev = function(){
  			var index = $scope.getActiveHostIndex() - 1;
  			var id = $scope.hostResults[index].id;
  			$state.go('jobDetail.host-event.details', {eventId: id}) 		
diff --git a/awx/ui/client/src/job-detail/job-detail.service.js b/awx/ui/client/src/job-detail/job-detail.service.js
index 58249d9aa2..381ff56c18 100644
--- a/awx/ui/client/src/job-detail/job-detail.service.js
+++ b/awx/ui/client/src/job-detail/job-detail.service.js
@@ -33,16 +33,18 @@ export default
             });
 
             // flatten Ansible's passed-through response
-            result.event_data = {};
-            Object.keys(data.event_data.res).forEach(function(key, index){
-                if (ignored.indexOf(key) > -1) {
-                    return
-                }
-                else{
-                    //console.log(key, data.event_data.res[key])
-                    result.event_data[key] = data.event_data.res[key];
-                }
-            });
+            try{
+                result.event_data = {};
+                Object.keys(data.event_data.res).forEach(function(key, index){
+                    if (ignored.indexOf(key) > -1) {
+                        return
+                    }
+                    else{
+                        result.event_data[key] = data.event_data.res[key];
+                    }
+                });
+            }
+            catch(err){result.event_data = null;}
 
             return result
         },
diff --git a/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js b/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js
index d43fbff3b0..f949d142ad 100644
--- a/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js
+++ b/awx/ui/client/src/job-templates/copy/job-templates-copy.service.js
@@ -23,7 +23,8 @@
  			set: function(data){
 	 			var defaultUrl = GetBasePath('job_templates');
 	 			Rest.setUrl(defaultUrl);
-	 			data.results[0].name = data.results[0].name + ' ' + moment().format('h:mm:ss a'); // 2:49:11 pm
+	 			var name = this.buildName(data.results[0].name)
+	 			data.results[0].name = name + ' @ ' + moment().format('h:mm:ss a'); // 2:49:11 pm
 	 			return Rest.post(data.results[0])
 	 				.success(function(res){
 	 					return res
@@ -32,6 +33,10 @@
 						ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
 	                	msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
 	 				});
+ 			},
+ 			buildName: function(name){
+ 				var result = name.split('@')[0];
+ 				return result
  			}
  		}
  	}