diff --git a/app/pods/components/music-tab/mixins/helpers.js b/app/pods/components/music-tab/mixins/helpers.js
index 54b6abc..97420cd 100644
--- a/app/pods/components/music-tab/mixins/helpers.js
+++ b/app/pods/components/music-tab/mixins/helpers.js
@@ -1,7 +1,7 @@
 import Em from 'ember';
 
 export default Em.Mixin.create({
-  classNames: ['col-lg-10', 'col-lg-offset-2', 'col-xs-12'],
+  classNames: ['col-sm-10', 'col-sm-offset-1', 'col-xs-12'],
   classNameBindings: ['active::hidden'],
   elementId: 'musicTab',
 
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 3a4063b..93a42c5 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -143,7 +143,7 @@
 <div id="playerBottom" class="row {{if dimmerOn "dimmerOn"}}">
 <div id="beatArea" class="col-sm-7 col-xs-12">
 {{#if usingBeatPreferences}}
-  <span data-toggle="tooltip" data-placement="bottom auto" data-title="Using the saved sensitivity preference from the last time you listened to this song" class="savedStarTooltip" id="saveBeatPreferencesStar">
+  <span data-toggle="tooltip" data-placement="bottom" data-title="Using the saved sensitivity preference from the last time you listened to this song" class="bootstrapTooltip" id="saveBeatPreferencesStar">
   {{paper-icon class=dimmerOnClass icon="star"}}
   </span>
 {{/if}}
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 393042d..efee645 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -999,7 +999,7 @@ body.dimmerOn {
 #saveBeatPreferencesStar {
   position: absolute;
   top: 3px;
-  left: 3px;
+  z-index: 1000;
   md-icon {
     color: $secondaryThemeColor !important;
     font-size: 25px;
diff --git a/bower.json b/bower.json
index f65dfd1..de8eba8 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
   "name": "huegasm",
   "dependencies": {
     "bootstrap-sass": "~3.3.5",
-    "ember": "~2.1.0",
+    "ember": "~2.2.0",
     "ember-cli-shims": "0.0.6",
     "ember-cli-test-loader": "0.2.1",
     "ember-data": "~2.1.0",