diff --git a/app/components/environment-header/template.hbs b/app/components/environment-header/template.hbs
index ae0f97774..fbcaacf65 100644
--- a/app/components/environment-header/template.hbs
+++ b/app/components/environment-header/template.hbs
@@ -11,14 +11,15 @@
       {{#link-to "environment.code" classNames="btn btn-sm btn-default"}}<i class="ss-file"></i>{{/link-to}}
     </div>
     <div class="btn-group">
+      {{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-primary btn-sm"}}Add Service{{/link-to}}
       <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-        Add&hellip; <span class="caret"></span>
+        <span class="caret"></span>
+        <span class="sr-only">Toggle Dropdown</span>
       </button>
       <ul class="dropdown-menu" role="menu">
-        <li>{{#link-to "service.new" (query-params environmentId=model.id)}}Service{{/link-to}}</li>
-        <li>{{#link-to "service.new-balancer" (query-params environmentId=model.id)}}Balancer Service{{/link-to}}</li>
-        <li>{{#link-to "service.new-external" (query-params environmentId=model.id)}}External Service{{/link-to}}</li>
-        <li>{{#link-to "service.new-alias" (query-params environmentId=model.id)}}Service Alias{{/link-to}}</li>
+        <li>{{#link-to "service.new-alias" (query-params environmentId=model.id)}}Add Service Alias{{/link-to}}</li>
+        <li>{{#link-to "service.new-balancer" (query-params environmentId=model.id)}}Add Balancer Service{{/link-to}}</li>
+        <li>{{#link-to "service.new-external" (query-params environmentId=model.id)}}Add External Service{{/link-to}}</li>
       </ul>
     </div>
   </h3>
diff --git a/app/components/project-section/template.hbs b/app/components/project-section/template.hbs
index cfa04ae46..ca9e12c39 100644
--- a/app/components/project-section/template.hbs
+++ b/app/components/project-section/template.hbs
@@ -21,9 +21,6 @@
       <li>{{#link-to "service.new-external" (query-params environmentId=model.id)}}Add External Service{{/link-to}}</li>
     </ul>
   </div>
-
-
-
 </h4>
 <h6 style="margin-top: 3px;">
   <span class="right-divider" tooltip="Service Count"><i class="ss-layers"></i>&nbsp;{{model.services.length}}</span>
diff --git a/app/mixins/github-info.js b/app/mixins/github-info.js
index 4b64c5716..5629b3061 100644
--- a/app/mixins/github-info.js
+++ b/app/mixins/github-info.js
@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import C from 'ui/utils/constants';
 import Util from 'ui/utils/util';
 
 export default Ember.Mixin.create({
@@ -61,6 +60,10 @@ export default Ember.Mixin.create({
     });
   }.observes('login','type','fallback').on('init'),
 
+  baseUrl: function() {
+    return 'https://' + (this.get('app.githubHostname')||'github.com') + '/';
+  }.property('app.githubHostname'),
+
   avatarUrl: function(){
     var url = this.get('_avatarUrl');
     if ( url )
@@ -74,7 +77,7 @@ export default Ember.Mixin.create({
     var org = this.get('org');
     if ( org && this.get('type') === 'team' )
     {
-      return C.GITHUB.URL + 'orgs/' + encodeURIComponent(org);
+      return this.get('baseUrl') + 'orgs/' + encodeURIComponent(org);
     }
   }.property('type','org'),
 
@@ -84,12 +87,12 @@ export default Ember.Mixin.create({
       var entry = this.get('github').teamById(this.get('login'));
       if ( entry && entry.slug )
       {
-        return C.GITHUB.URL + 'orgs/' + encodeURIComponent(entry.org) + '/teams/' + encodeURIComponent(entry.slug);
+        return this.get('baseUrl')+ 'orgs/' + encodeURIComponent(entry.org) + '/teams/' + encodeURIComponent(entry.slug);
       }
     }
     else
     {
-      return C.GITHUB.URL + encodeURIComponent(this.get('login'));
+      return this.get('baseUrl') + encodeURIComponent(this.get('login'));
     }
   }.property('login'),
 });
diff --git a/app/settings/auth/template.hbs b/app/settings/auth/template.hbs
index 56a3d0228..92894ee07 100644
--- a/app/settings/auth/template.hbs
+++ b/app/settings/auth/template.hbs
@@ -125,7 +125,10 @@
       <p>
         <ul>
           <li>
-            <a href="https://github.com/settings/developers" target="_blank">Click here</a> to go to your GitHub applications settings in a new window.
+            For standard GitHub, <a href="https://github.com/settings/developers" target="_blank">click here</a> to go applications settings in a new window.
+              <ul>
+                <li>For Github Enterprise, login to your account.  Click on Settings, then Applications.</li>
+              </ul>
           </li>
           <li>
             Click &quot;Register new application&quot; and fill out the form:
diff --git a/app/utils/constants.js b/app/utils/constants.js
index e2fefd7e3..e20958640 100644
--- a/app/utils/constants.js
+++ b/app/utils/constants.js
@@ -39,7 +39,6 @@ export default {
   },
 
   GITHUB: {
-    URL: 'https://www.github.com/',
     DEFAULT_HOSTNAME: 'github.com',
     AUTH_PATH: '/login/oauth/authorize',
     PROXY_URL: '/github/',