diff --git a/web/app/assets/javascripts/download_jamtrack.js.coffee b/web/app/assets/javascripts/download_jamtrack.js.coffee
index 58592a73c..8890e6b87 100644
--- a/web/app/assets/javascripts/download_jamtrack.js.coffee
+++ b/web/app/assets/javascripts/download_jamtrack.js.coffee
@@ -243,6 +243,7 @@ context.JK.DownloadJamTrack = class DownloadJamTrack
     @logger.debug "downloadCheck"
 
   retry: () =>
+    @logger.debug "user initiated retry"
     @path = []
     @path.push('retry')
     this.clear()
diff --git a/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee
index 2360818ca..4d307ae9a 100644
--- a/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamTrackFilterScreen.js.jsx.coffee
@@ -134,7 +134,7 @@ MIX_MODES = context.JK.MIX_MODES
 
     jamTracksSection =
       `<div>
-        <h2 className="jamtrack-results-header">{jamtracksHeader}</h2>
+        <h2 className="jamtrack-results-header">{jamtracksHeader} <a className="back-to-jamtracks-home" href="/client#/jamtrack">back to jamtracks home</a></h2>
         <table className="generaltable jamtrack-table">
           <thead>
           <tr>
diff --git a/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
index c185608b3..3d92b5dc6 100644
--- a/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamTrackSearchScreen.js.jsx.coffee
@@ -49,9 +49,9 @@ MIX_MODES = context.JK.MIX_MODES
           if track.part != ''
             track.instrument_desc += ' (' + track.part + ')'
 
-      trackRow.free_state = if context.JK.currentUserFreeJamTrack then 'free' else 'non-free'
+      trackRow.free_state = if @state.is_free then 'free' else 'non-free'
 
-      trackRow.is_free = trackRow.free_state == 'free'
+      trackRow.is_free = @state.is_free == 'free'
 
       uiJamTracks.push trackRow
 
@@ -183,7 +183,8 @@ MIX_MODES = context.JK.MIX_MODES
 
       jamTracksSection =
         `<div>
-          <h2 className="jamtrack-results-header">{jamtracksHeader}</h2>
+          <h2 className="jamtrack-results-header">{jamtracksHeader} <a className="back-to-jamtracks-home" href="/client#/jamtrack">back to jamtracks home</a></h2>
+
           <table className="generaltable jamtrack-table">
             <thead>
             <tr>
@@ -216,8 +217,13 @@ MIX_MODES = context.JK.MIX_MODES
     </div>`
 
 
+
+  clearResults:() ->
+    @setState({currentPage: 0, next: null, show_all_artists: false, artists:[], jamtracks:[], type: 'user-input', searching:false, artist: null, song:null, is_free: context.JK.currentUserFreeJamTrack, first_search: true})
+
+
   getInitialState: () ->
-    {search: '', type: 'user-input', artists:[], jamtracks:[], show_all_artists: false, currentPage: 0, next: null, searching: false, first_search: true, count: 0}
+    {search: '', type: 'user-input', artists:[], jamtracks:[], show_all_artists: false, currentPage: 0, next: null, searching: false, first_search: true, count: 0, is_free: context.JK.currentUserFreeJamTrack}
 
   onSelectChange: (val) ->
     #@logger.debug("CHANGE #{val}")
@@ -255,11 +261,6 @@ MIX_MODES = context.JK.MIX_MODES
   hideExtraArtists: () ->
     @setState({show_all_artists: false})
 
-  clearResults:() ->
-    #@content.empty()
-    #@noMoreJamtracks.hide()
-    @setState({currentPage: 0, next: null, show_all_artists: false, artists:[], jamtracks:[], type: 'user-input', searching:false, artist: null, song:null})
-
 
   defaultQuery:(extra) ->
     query =
@@ -506,7 +507,10 @@ MIX_MODES = context.JK.MIX_MODES
 
 
   beforeShow: () ->
-    #@clearResults();
+    if !@state.first_search
+      @setState({is_free: context.JK.currentUserFreeJamTrack})
+      @search(@state.type, window.JamTrackSearchInput)
+
 
 
   onAppInit: (@app) ->
diff --git a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
index fdbaa40e9..1915a1792 100644
--- a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
@@ -210,7 +210,6 @@ ChannelGroupIds = context.JK.ChannelGroupIds
           <img src="/assets/content/icon_close.png" width="18" height="20" />
           Close JamTrack
         </a>
-        <div className="download-jamtrack-holder"></div>
       </div>`
 
       contents = closeOptions
@@ -236,6 +235,9 @@ ChannelGroupIds = context.JK.ChannelGroupIds
       </a>`
 
 
+      if this.state.downloadJamTrack?
+        mediaTracks.push `<div key="download-jamtrack-holder" className="download-jamtrack-holder"></div>`
+
       if this.state.mediaSummary.backingTrackOpen
 
         for backingTrack in @state.backingTracks
diff --git a/web/app/assets/stylesheets/client/react-components/JamTrackFilterScreen.css.scss b/web/app/assets/stylesheets/client/react-components/JamTrackFilterScreen.css.scss
index 5bf2d9f5c..e8a8e8aa6 100644
--- a/web/app/assets/stylesheets/client/react-components/JamTrackFilterScreen.css.scss
+++ b/web/app/assets/stylesheets/client/react-components/JamTrackFilterScreen.css.scss
@@ -5,4 +5,12 @@
     padding:15px 30px;
   }
 
+  .back-to-jamtracks-home {
+    font-weight: normal;
+    margin-right: 2px;
+    margin-top: 6px;
+    font-size:12px;
+    float:right;
+  }
+
 }
diff --git a/web/app/assets/stylesheets/client/react-components/JamTrackSearchScreen.css.scss b/web/app/assets/stylesheets/client/react-components/JamTrackSearchScreen.css.scss
index d412dac4c..8acc36491 100644
--- a/web/app/assets/stylesheets/client/react-components/JamTrackSearchScreen.css.scss
+++ b/web/app/assets/stylesheets/client/react-components/JamTrackSearchScreen.css.scss
@@ -32,6 +32,14 @@
     }
   }
 
+  .back-to-jamtracks-home {
+    font-weight: normal;
+    margin-right: 2px;
+    margin-top: 6px;
+    font-size:12px;
+    float:right;
+  }
+
   .jamtrack-results-header {
     margin-top:10px;
   }
diff --git a/web/spec/features/jamtrack_shopping_spec.rb b/web/spec/features/jamtrack_shopping_spec.rb
index 1e46de608..691e1d282 100644
--- a/web/spec/features/jamtrack_shopping_spec.rb
+++ b/web/spec/features/jamtrack_shopping_spec.rb
@@ -11,7 +11,7 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature
   before(:all) do
     Capybara.javascript_driver = :poltergeist
     Capybara.current_driver = Capybara.javascript_driver
-    Capybara.default_wait_time = 30 # these tests are SLOOOOOW
+    Capybara.default_wait_time = 10 # these tests are SLOOOOOW
   end
 
 
@@ -83,17 +83,22 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature
       find('.cart-item-price', text: "$ #{jt_us.price}")
 
       find('a.button-orange', text: 'CONTINUE SHOPPING').trigger(:click)
+      find('button.disabled.search-btn')
+
+
       find_jamtrack jt_us, {added_cart: true}
 
       find('a.header-shopping-cart').trigger(:click)
       find("a.remove-cart").trigger(:click)
       find('a.button-orange', text: 'CONTINUE SHOPPING').trigger(:click)
-      j
+      find('button.disabled.search-btn')
+
       find_jamtrack jt_us
 
       find("a.jamtrack-add-cart[data-jamtrack-id=\"#{jt_us.id}\"]").trigger(:click)
       find('.shopping-sub-total', text: "Subtotal:$ #{jt_us.price}")
       find('a.button-orange', text: 'CONTINUE SHOPPING').trigger(:click)
+      find('button.disabled.search-btn')
 
       find_jamtrack jt_ww