diff --git a/src/components/AnsibleSelect/AnsibleSelect.test.jsx b/src/components/AnsibleSelect/AnsibleSelect.test.jsx
index 7077f08ff8..86757ad1e1 100644
--- a/src/components/AnsibleSelect/AnsibleSelect.test.jsx
+++ b/src/components/AnsibleSelect/AnsibleSelect.test.jsx
@@ -4,10 +4,12 @@ import AnsibleSelect, { _AnsibleSelect } from './AnsibleSelect';
 
 const mockData = [
   {
+    key: 'baz',
     label: 'Baz',
     value: '/venv/baz/'
   },
   {
+    key: 'default',
     label: 'Default',
     value: '/venv/ansible/'
   }
diff --git a/src/components/LaunchButton/LaunchButton.jsx b/src/components/LaunchButton/LaunchButton.jsx
index 79c590160d..8db00f36c1 100644
--- a/src/components/LaunchButton/LaunchButton.jsx
+++ b/src/components/LaunchButton/LaunchButton.jsx
@@ -15,7 +15,7 @@ const StyledLaunchButton = styled(Button)`
   padding: 5px 8px;
 
   &:hover {
-    background-color:#d9534f;
+    background-color: #0066cc;
     color: white;
   }
 `;
diff --git a/src/screens/Template/TemplateEdit/TemplateEdit.jsx b/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
similarity index 94%
rename from src/screens/Template/TemplateEdit/TemplateEdit.jsx
rename to src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
index 8d4b679255..4ebffdca5b 100644
--- a/src/screens/Template/TemplateEdit/TemplateEdit.jsx
+++ b/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
@@ -5,7 +5,7 @@ import TemplateForm from '../shared/TemplateForm';
 import { JobTemplatesAPI } from '@api';
 import { JobTemplate } from '@types';
 
-class TemplateEdit extends Component {
+class JobTemplateEdit extends Component {
   static propTypes = {
     template: JobTemplate.isRequired,
   };
@@ -60,4 +60,4 @@ class TemplateEdit extends Component {
   }
 }
 
-export default withRouter(TemplateEdit);
+export default withRouter(JobTemplateEdit);
diff --git a/src/screens/Template/TemplateEdit/TemplateEdit.test.jsx b/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
similarity index 90%
rename from src/screens/Template/TemplateEdit/TemplateEdit.test.jsx
rename to src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
index 6e6d8e24f3..ce55184c36 100644
--- a/src/screens/Template/TemplateEdit/TemplateEdit.test.jsx
+++ b/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { JobTemplatesAPI } from '@api';
 import { mountWithContexts } from '@testUtils/enzymeHelpers';
-import TemplateEdit from './TemplateEdit';
+import JobTemplateEdit from './JobTemplateEdit';
 
 jest.mock('@api');
 
-describe('<TemplateEdit />', () => {
+describe('<JobTemplateEdit />', () => {
   const mockData = {
     id: 1,
     name: 'Foo',
@@ -24,7 +24,7 @@ describe('<TemplateEdit />', () => {
 
   test('initially renders successfully', () => {
     mountWithContexts(
-      <TemplateEdit
+      <JobTemplateEdit
         template={mockData}
       />
     );
@@ -32,7 +32,7 @@ describe('<TemplateEdit />', () => {
 
   test('handleSubmit should call api update', () => {
     const wrapper = mountWithContexts(
-      <TemplateEdit
+      <JobTemplateEdit
         template={mockData}
       />
     );
@@ -51,7 +51,7 @@ describe('<TemplateEdit />', () => {
       push: jest.fn(),
     };
     const wrapper = mountWithContexts(
-      <TemplateEdit
+      <JobTemplateEdit
         template={mockData}
       />,
       { context: { router: { history } } }
diff --git a/src/screens/Template/JobTemplateEdit/index.js b/src/screens/Template/JobTemplateEdit/index.js
new file mode 100644
index 0000000000..f2ce68547a
--- /dev/null
+++ b/src/screens/Template/JobTemplateEdit/index.js
@@ -0,0 +1 @@
+export { default } from './JobTemplateEdit';
diff --git a/src/screens/Template/Template.jsx b/src/screens/Template/Template.jsx
index 11e7e6186d..af9a10e63f 100644
--- a/src/screens/Template/Template.jsx
+++ b/src/screens/Template/Template.jsx
@@ -17,7 +17,7 @@ import ContentError from '@components/ContentError';
 import RoutedTabs from '@components/RoutedTabs';
 import JobTemplateDetail from './JobTemplateDetail';
 import { JobTemplatesAPI } from '@api';
-import TemplateEdit from './TemplateEdit';
+import JobTemplateEdit from './JobTemplateEdit';
 
 class Template extends Component {
   constructor (props) {
@@ -131,7 +131,7 @@ class Template extends Component {
               <Route
                 path="/templates/:templateType/:id/edit"
                 render={() => (
-                  <TemplateEdit
+                  <JobTemplateEdit
                     template={template}
                   />
                 )}
diff --git a/src/screens/Template/TemplateEdit/index.js b/src/screens/Template/TemplateEdit/index.js
deleted file mode 100644
index aa6384ec8f..0000000000
--- a/src/screens/Template/TemplateEdit/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './TemplateEdit';
diff --git a/src/screens/Template/Templates.jsx b/src/screens/Template/Templates.jsx
index a73ee935cb..751d789fae 100644
--- a/src/screens/Template/Templates.jsx
+++ b/src/screens/Template/Templates.jsx
@@ -28,8 +28,9 @@ class Templates extends Component {
     }
     const breadcrumbConfig = {
       '/templates': i18n._(t`Templates`),
-      [`/templates/${template.type}/${template.id}/details`]: i18n._(t`${template.name} Details`),
-      [`/templates/${template.type}/${template.id}/edit`]: i18n._(t`${template.name} Edit`)
+      [`/templates/${template.type}/${template.id}`]: `${template.name}`,
+      [`/templates/${template.type}/${template.id}/details`]: i18n._(t`Details`),
+      [`/templates/${template.type}/${template.id}/edit`]: i18n._(t`Edit Details`),
     };
     this.setState({ breadcrumbConfig });
   }