diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js
index 559ae55..0c7736e 100644
--- a/app/pods/components/music-tab/component.js
+++ b/app/pods/components/music-tab/component.js
@@ -485,7 +485,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
 
   loadSongBeatPreferences() {
     var song = this.get('playQueue')[this.get('playQueuePointer')],
-      title = Em.isEmpty(song.artist) ? song.filename : song.artist + '-' + song.title,
+      title = Em.isEmpty(song.artist) ? song.fileName : song.artist + '-' + song.title,
       songBeatPreferences = this.get('songBeatPreferences'),
       preference = songBeatPreferences[title],
       oldBeatPrefCache = this.get('oldBeatPrefCache'),
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 6b94935..0ed9922 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -146,9 +146,9 @@
 <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 your saved beat preferences from the last time you listened to this song" class="bootstrapTooltip savedStarTooltip">
-{{paper-icon id="saveBeatPreferencesStar" icon="star"}}
-</span>
+  <span data-toggle="tooltip" data-placement="bottom auto" data-title="Using your saved beat preferences from the last time you listened to this song" class="bootstrapTooltip savedStarTooltip">
+  {{paper-icon id="saveBeatPreferencesStar" icon="star"}}
+  </span>
 {{/if}}
 
 <div class="row" id="beatOptionRow">
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 3df17af..ba392a8 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -1006,8 +1006,8 @@ body.dimmerOn {
 
 #saveBeatPreferencesStar {
   position: absolute;
-  top: 5px;
-  left: 5px;
+  top: 3px;
+  left: 3px;
   color: $secondaryThemeColor !important;
   font-size: 25px;
 }