diff --git a/web/app/assets/javascripts/jam_track_preview.js.coffee b/web/app/assets/javascripts/jam_track_preview.js.coffee
index d4462bd10..9e74ce05c 100644
--- a/web/app/assets/javascripts/jam_track_preview.js.coffee
+++ b/web/app/assets/javascripts/jam_track_preview.js.coffee
@@ -35,6 +35,7 @@ context.JK.JamTrackPreview = class JamTrackPreview
     @part = @root.find('.part')
     @loading = @root.find('.loading')
     @loadingText = @root.find('.loading-text')
+    @loadingTextText = @root.find('.loading-text-text')
 
     @playButton.on('click', @play)
     @stopButton.on('click', @stop)
@@ -43,10 +44,12 @@ context.JK.JamTrackPreview = class JamTrackPreview
     instrumentId = null
     instrumentDescription = '?'
     if @jamTrackTrack.track_type == 'Track'
+      @loadingTextText.text('20 second preview loading')
       if @jamTrackTrack.instrument
         instrumentId = @jamTrackTrack.instrument.id
         instrumentDescription = @jamTrackTrack.instrument.description
     else
+      @loadingTextText.text('preview loading')
       instrumentId = 'other'
       instrumentDescription= 'Master Mix'
 
@@ -122,8 +125,8 @@ context.JK.JamTrackPreview = class JamTrackPreview
 
   onHowlerLoad: () =>
     @loaded = true
-    @loading.fadeOut();
-    @loadingText.fadeOut(); #addClass('hidden')
+    @loading.fadeOut(2000);
+    @loadingText.fadeOut(2000); #addClass('hidden')
 
   play: (e) =>
     if e?
diff --git a/web/app/assets/javascripts/react-components/JamTrackPreview.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackPreview.js.jsx.coffee
index df53df700..9adcfc249 100644
--- a/web/app/assets/javascripts/react-components/JamTrackPreview.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamTrackPreview.js.jsx.coffee
@@ -33,9 +33,16 @@ ReactCSSTransitionGroup = React.addons.CSSTransitionGroup
       activeButton = `<a className={playButtonClasses} onClick={this.play} />`
 
     loaders = []
+    if @props.jamTrackTrack.track_type == 'Track'
+      loading_text = '20 second preview loading'
+    else
+      loading_text = 'preview loading'
+
+
     if @state.loading
-      loaders.push `<div key="spinner" className="loading spinner-small"></div>`
-      loaders.push `<div key="text" className="loading-text">preview loading</div>`
+      loaders.push `<div key="text" className="loading-text">{loading_text}
+        <div className="loading spinner-small"></div>
+      </div>`
 
 
     `<div className="jam-track-preview" data-track-type={this.props.jamTrackTrack.track_type} data-id={this.props.jamTrackTrack.id}>
diff --git a/web/app/assets/stylesheets/client/jamTrackPreview.css.scss b/web/app/assets/stylesheets/client/jamTrackPreview.css.scss
index 439b57cba..76e22c706 100644
--- a/web/app/assets/stylesheets/client/jamTrackPreview.css.scss
+++ b/web/app/assets/stylesheets/client/jamTrackPreview.css.scss
@@ -71,7 +71,7 @@
   .spinner-small {
     vertical-align: middle;
     top: -4px;
-    right: -32px;
+    left:160px;
     position:absolute;
     &.hidden {
       display:none;
@@ -80,15 +80,16 @@
 
   .loading-text {
     position:absolute;
-    right:-135px;
-    top:0;
-    padding:0 3px;
+    top:25px;
+    left:0;
+    padding:0 7px;
     font-style:italic;
     z-index:1;
     -webkit-border-radius:10px;
     -moz-border-radius:10px;
     border-radius:10px;
     border:0 solid black;
+    background-color:black;
   }
 
   .adds-line-break {
diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss
index 06225f2a9..6af987666 100644
--- a/web/app/assets/stylesheets/client/jamkazam.css.scss
+++ b/web/app/assets/stylesheets/client/jamkazam.css.scss
@@ -699,3 +699,7 @@ $ReactSelectVerticalPadding: 3px;
     box-sizing: border-box;
     margin-top: -1px;
 }
+
+.Select-search-prompt {
+    padding:3px 0 !important;
+}
\ No newline at end of file
diff --git a/web/app/assets/stylesheets/client/jamtrackSearch.css.scss b/web/app/assets/stylesheets/client/jamtrackSearch.css.scss
index 945032436..1cd947e67 100644
--- a/web/app/assets/stylesheets/client/jamtrackSearch.css.scss
+++ b/web/app/assets/stylesheets/client/jamtrackSearch.css.scss
@@ -225,7 +225,6 @@
     white-space:nowrap;
 
     .loading-text {
-      right:-115px;
       background-color:#262626;
     }
   }
diff --git a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss
index c68b8751a..a45d0d720 100644
--- a/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss
+++ b/web/app/assets/stylesheets/landings/individual_jamtrack.css.scss
@@ -103,7 +103,7 @@ body.web.landing_jamtrack.individual_jamtrack {
 
     .loading-text {
       right:-1px;
-      background-color:#262626;
+      background-color:black;
     }
   }
 
diff --git a/web/app/views/clients/_jam_track_preview.html.slim b/web/app/views/clients/_jam_track_preview.html.slim
index 65f570949..230e40136 100644
--- a/web/app/views/clients/_jam_track_preview.html.slim
+++ b/web/app/views/clients/_jam_track_preview.html.slim
@@ -7,5 +7,7 @@ script type="text/template" id='template-jam-track-preview'
     .instrument-part
     .instrument-name
     .part
-    .loading.spinner-small.hidden
-    .loading-text.hidden preview loading
\ No newline at end of file
+
+    .loading-text.hidden
+      .loading-text-text preview loading
+      .loading.spinner-small.hidden
\ No newline at end of file