diff --git a/awx/ui/static/js/helpers/Jobs.js b/awx/ui/static/js/helpers/Jobs.js
index 70dce3ccc1..d18b88626a 100644
--- a/awx/ui/static/js/helpers/Jobs.js
+++ b/awx/ui/static/js/helpers/Jobs.js
@@ -84,10 +84,6 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
list = scope.jobs;
}
job = Find({ list: list, key: 'id', val: id });
-<<<<<<< HEAD
-=======
- // console.log('job type: ' + job.type);
->>>>>>> added functionality for resizing graphs/jobs table, and changed dummy data to better reflect actual expected server response
if (job.type === 'job') {
$location.url('/jobs/' + job.id);
}
diff --git a/awx/ui/static/less/main-layout.less b/awx/ui/static/less/main-layout.less
index d8539f97b2..d8e0022569 100644
--- a/awx/ui/static/less/main-layout.less
+++ b/awx/ui/static/less/main-layout.less
@@ -68,11 +68,12 @@ body {
display: block;
}
}
-
#account-menu {
display: none;
}
-
+ #account-submenu {
+ margin-left: 20px;
+ }
#socket-beacon-div {
display: block;
position: fixed;
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 92af11bafe..9b806d19cc 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -194,19 +194,32 @@
Inventories
Job Templates
Jobs
+ Login
+
+
+
+
+
+