diff --git a/web/app/assets/javascripts/accounts_profile.js b/web/app/assets/javascripts/accounts_profile.js
index 584fb6ff8..9938d4cf0 100644
--- a/web/app/assets/javascripts/accounts_profile.js
+++ b/web/app/assets/javascripts/accounts_profile.js
@@ -28,8 +28,8 @@
     var $biography = $screen.find('#biography');
     var $subscribe = $screen.find('#subscribe');
 
-    var $btnCancel = $screen.find('#account-edit-profile-cancel');
-    var $btnSubmit = $screen.find('#account-edit-profile-submit');
+    var $btnCancel = $screen.find('.account-edit-profile-cancel');
+    var $btnSubmit = $screen.find('.account-edit-profile-submit');
 
     function beforeShow(data) {
         userId = data.id;
diff --git a/web/app/assets/javascripts/accounts_profile_experience.js b/web/app/assets/javascripts/accounts_profile_experience.js
index 6bb22fbab..de57e8695 100644
--- a/web/app/assets/javascripts/accounts_profile_experience.js
+++ b/web/app/assets/javascripts/accounts_profile_experience.js
@@ -10,9 +10,9 @@
     var api = context.JK.Rest();
     var $screen = $('#account-profile-experience');
     var profileUtils = context.JK.ProfileUtils;
-    var $btnCancel = $screen.find('#account-edit-profile-cancel');
-    var $btnBack = $screen.find('#account-edit-profile-back');
-    var $btnSubmit = $screen.find('#account-edit-profile-submit');
+    var $btnCancel = $screen.find('.account-edit-profile-cancel');
+    var $btnBack = $screen.find('.account-edit-profile-back');
+    var $btnSubmit = $screen.find('.account-edit-profile-submit');
 
     var $instrumentSelector = $screen.find('.instrument_selector');
     var $userGenres = $screen.find('#user-genres');
diff --git a/web/app/assets/javascripts/accounts_profile_interests.js b/web/app/assets/javascripts/accounts_profile_interests.js
index 6257e69ed..6a4a65e2c 100644
--- a/web/app/assets/javascripts/accounts_profile_interests.js
+++ b/web/app/assets/javascripts/accounts_profile_interests.js
@@ -62,9 +62,9 @@
     var $cowritingGenreList = $cowritingGenres.find(GENRE_LIST_SELECTOR)
     var $cowritingPurpose = $screen.find('#cowriting-purpose')
 
-    var $btnCancel = $screen.find('#account-edit-profile-cancel')
-    var $btnBack = $screen.find('#account-edit-profile-back')
-    var $btnSubmit = $screen.find('#account-edit-profile-submit')
+    var $btnCancel = $screen.find('.account-edit-profile-cancel')
+    var $btnBack = $screen.find('.account-edit-profile-back')
+    var $btnSubmit = $screen.find('.account-edit-profile-submit')
 
     function beforeShow(data) {
     }
diff --git a/web/app/assets/javascripts/accounts_profile_samples.js b/web/app/assets/javascripts/accounts_profile_samples.js
index 67fc330be..6cce9de0e 100644
--- a/web/app/assets/javascripts/accounts_profile_samples.js
+++ b/web/app/assets/javascripts/accounts_profile_samples.js
@@ -37,22 +37,22 @@
     var $youTubeSampleList = $screen.find(".sample-list[source-type='youtube']")
 
     // buttons
-    var $btnAddJkRecording = $screen.find('.btn-add-jk-recording');
-    var $btnCancel = $screen.find('.account-edit-profile-cancel');
-    var $btnBack = $screen.find('.account-edit-profile-back');
-    var $btnSubmit = $screen.find('.account-edit-profile-submit');
+    var $btnAddJkRecording = $screen.find('.btn-add-jk-recording')
+    var $btnCancel = parent.find('.account-edit-profile-cancel')
+    var $btnBack = parent.find('.account-edit-profile-back')
+    var $btnSubmit = parent.find('.account-edit-profile-submit')
 
 
-    var urlValidator=null;
-    var soundCloudValidator=null;
-    var reverbNationValidator=null;
-    var bandCampValidator=null;
-    var fandalismValidator=null;
-    var youTubeValidator=null;
-    var facebookValidator=null;
-    var twitterValidator=null;
-    var soundCloudRecordingValidator=null;
-    var youTubeRecordingValidator=null;
+    var urlValidator=null
+    var soundCloudValidator=null
+    var reverbNationValidator=null
+    var bandCampValidator=null
+    var fandalismValidator=null
+    var youTubeValidator=null
+    var facebookValidator=null
+    var twitterValidator=null
+    var soundCloudRecordingValidator=null
+    var youTubeRecordingValidator=null
 
     function beforeShow(data) {
     }
@@ -221,12 +221,12 @@
       })
     }
 
-    function enableSubmits() {
-      $btnSubmit.on("click", function(evt) {
-        evt.stopPropagation();
+    function enableSubmits() {      
+      $btnSubmit.off("click").on("click", function(e) {        
+        e.stopPropagation();
         handleUpdateProfile();
         return false;
-      });
+      })
 
       $btnSubmit.removeClass("disabled")
     }
diff --git a/web/app/views/clients/_account.html.erb b/web/app/views/clients/_account.html.erb
index 29d806a94..02afa69d4 100644
--- a/web/app/views/clients/_account.html.erb
+++ b/web/app/views/clients/_account.html.erb
@@ -112,12 +112,12 @@
         <hr />
 
         <div class="account-left">
-          <h2>jamtracks:</h2>          
+          <h2>jamtracks:</h2>
         </div>
 
         <div class="account-mid subscriptions">
           <strong class="jamtrack-license-detail">
-            {{data.licenseDetail}}            
+            {{data.licenseDetail}}
           </strong>
           <br clear="all" />
           <a href="/corp/terms#purchasing-jamtracks" rel="external" class="view-license" id="account-view-license-link">JamTracks License</a>
diff --git a/web/app/views/clients/_account_profile_samples.html.erb b/web/app/views/clients/_account_profile_samples.html.erb
index df5392e0f..797237b66 100644
--- a/web/app/views/clients/_account_profile_samples.html.erb
+++ b/web/app/views/clients/_account_profile_samples.html.erb
@@ -19,9 +19,9 @@
           <br/><br/>
 
           <div class="right field actions">
-            <a id="account-edit-profile-cancel" class="button-grey">CANCEL</a>&nbsp;
-            <a id="account-edit-profile-back" class="button-grey">BACK</a>&nbsp;
-            <a id="account-edit-profile-submit" class="button-orange">SAVE &amp; FINISH</a>
+            <a class="account-edit-profile-cancel button-grey">CANCEL</a>&nbsp;
+            <a class="account-edit-profile-back button-grey">BACK</a>&nbsp;
+            <a class="account-edit-profile-submit button-orange">SAVE &amp; FINISH</a>
           </div>
 
           <div class="clearall"></div>
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
index 09aab62fa..46d8169c0 100644
--- a/web/app/views/clients/index.html.erb
+++ b/web/app/views/clients/index.html.erb
@@ -168,7 +168,7 @@
             var openBackingTrackDialog = new JK.OpenBackingTrackDialog(JK.app);
             openBackingTrackDialog.initialize();
 
-            var configureTracksDialog = new JK.ConfigureTracksDialog(JK.app, null, api.getUserProfile, api.updateUser)
+            var configureTracksDialog = new JK.ConfigureTracksDialog(JK.app)
             configureTracksDialog.initialize();
 
             var networkTestDialog = new JK.NetworkTestDialog(JK.app);
@@ -236,7 +236,7 @@
             var accountProfileInterests = new JK.AccountProfileInterests(JK.app);
             accountProfileInterests.initialize();
 
-            var accountProfileSamples = new JK.AccountProfileSamples(JK.app, $(".account-profile-samples"))
+            var accountProfileSamples = new JK.AccountProfileSamples(JK.app, $(".account-profile-samples"), api.getUserProfile, api.updateUser)
             accountProfileSamples.initialize();
 
             var accountAudioProfile = new JK.AccountAudioProfile(JK.app);
diff --git a/web/spec/features/account_spec.rb b/web/spec/features/account_spec.rb
index 28cf849c9..439a754b3 100644
--- a/web/spec/features/account_spec.rb
+++ b/web/spec/features/account_spec.rb
@@ -89,7 +89,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
           fill_in "first_name", with: "Bobby"
           fill_in "last_name", with: "Toes"
           uncheck('subscribe_email')
-          find("#account-edit-profile-submit").trigger(:click)
+          find(".account-edit-profile-submit").trigger(:click)
         end
 
         it {
@@ -107,7 +107,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
           jk_select("Jan", '#account-edit-profile-form #user_birth_date_2i')
           jk_select("12", '#account-edit-profile-form #user_birth_date_3i')
           jk_select("1960", '#account-edit-profile-form #user_birth_date_1i')
-          find("#account-edit-profile-submit").trigger(:click)
+          find(".account-edit-profile-submit").trigger(:click)
           
           user.reload
           user.birth_date == "1960-01-12"
@@ -125,7 +125,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
         before(:each) do
           fill_in "first_name", with: ""
           fill_in "last_name", with: ""
-          find("#account-edit-profile-submit").trigger(:click)
+          find(".account-edit-profile-submit").trigger(:click)
         end
 
         it {