diff --git a/app/skill-picker/skill-picker.controller.js b/app/skill-picker/skill-picker.controller.js
index 476fbb4b7..206685efa 100644
--- a/app/skill-picker/skill-picker.controller.js
+++ b/app/skill-picker/skill-picker.controller.js
@@ -22,6 +22,7 @@
     vm.loadingCommunities = false;
     vm.communities = {};
     vm.isPageDirty = isPageDirty;
+    vm.isTracksDirty = isTracksDirty;
     ///////
     activate();
 
diff --git a/app/skill-picker/skill-picker.jade b/app/skill-picker/skill-picker.jade
index 812f79bc5..a1e67fa29 100644
--- a/app/skill-picker/skill-picker.jade
+++ b/app/skill-picker/skill-picker.jade
@@ -1,7 +1,7 @@
 .skill-picker-container
   h1 Welcome to Topcoder
 
-  p.instruction Hi {{vm.username}}! Your account is now active. To help other members get to know you, select the tracks in which you're interested, and specify some of your skills. You can edit this information later on your Profile.
+  p.instruction Hi {{vm.username}}! Your account is now active. To help other members get to know you, select your areas of interest and specify some of your skills. You can edit this information later on your Profile.
 
   .communities(ng-show="!vm.loadingCommunities && vm.showCommunity")
     .communities__title Communities
@@ -40,7 +40,7 @@
           ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}")
           a(ng-click="vm.toggleSkill(tag.id.toString())")
             .icon 
-              img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-design.svg")
+              img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}images/skills/id-design.svg")
             .name {{tag.name}}
 
     .skills-section(ng-show="vm.tracks.DEVELOP")
@@ -51,7 +51,7 @@
           ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}")
           a(ng-click="vm.toggleSkill(tag.id.toString())")
             .icon 
-              img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-develop.svg")
+              img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}images/skills/id-develop.svg")
             .name {{tag.name}}
 
     .skills-section(ng-show="vm.tracks.DATA_SCIENCE")
@@ -62,7 +62,7 @@
           ng-class="{'selected-skill': vm.mySkills.indexOf(tag.id.toString()) > -1}")
           a(ng-click="vm.toggleSkill(tag.id.toString())")
             .icon 
-              img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="/images/skills/id-data.svg")
+              img(ng-src="{{vm.ASSET_PREFIX}}images/skills/id-{{tag.id}}.svg", fallback-src="{{vm.ASSET_PREFIX}}images/skills/id-data.svg")
             .name {{tag.name}}
 
 
@@ -70,4 +70,4 @@
     type="button",
     tc-busy-button, tc-busy-when="vm.saving",
     ng-click="vm.submitSkills()",
-    ng-disabled="vm.disableDoneButton || !vm.isPageDirty()") Done
+    ng-disabled="vm.disableDoneButton || !vm.isTracksDirty()") Done
diff --git a/assets/css/skill-picker/skill-picker.scss b/assets/css/skill-picker/skill-picker.scss
index 6432cbb22..d505f62a2 100644
--- a/assets/css/skill-picker/skill-picker.scss
+++ b/assets/css/skill-picker/skill-picker.scss
@@ -55,7 +55,7 @@
         padding: 15px 0;
         border-bottom: 1px solid $gray-light;
 
-        &.disabled {
+        &.community--disabled {
           background-color: $gray-lightest;
         }
 
diff --git a/config.js b/config.js
index a4659bbe3..3231cb300 100644
--- a/config.js
+++ b/config.js
@@ -152,7 +152,7 @@ module.exports = function() {
         API_URL: process.env.API_URL || 'https://api.topcoder.com/v3.0.0-BETA',
         AUTH_API_URL: process.env.AUTH_API_URL || 'https://api.topcoder.com/v3',
         API_URL_V2: process.env.API_URL_V2 || 'https://api.topcoder.com/v2',
-        ASSET_PREFIX: process.env.ASSET_PREFIX || 'https://s3.amazonaws.com/app.topcoder.com',
+        ASSET_PREFIX: process.env.ASSET_PREFIX || 'https://s3.amazonaws.com/app.topcoder.com/',
         auth0Callback: process.env.auth0Callback || 'https://api.topcoder.com/pub/callback.html',
         // auth0Callback: process.env.auth0Callback || 'https://www.topcoder.com/reg2/callback.action',
         auth0Domain: process.env.auth0Domain || 'topcoder.auth0.com',
@@ -201,7 +201,7 @@ module.exports = function() {
         API_URL: process.env.API_URL || 'https://api.topcoder.com/v3.0.0',
         AUTH_API_URL: process.env.AUTH_API_URL || 'https://api.topcoder.com/v3',
         API_URL_V2: process.env.API_URL_V2 || 'https://api.topcoder.com/v2',
-        ASSET_PREFIX: process.env.ASSET_PREFIX || 'https://s3.amazonaws.com/app.topcoder.com',
+        ASSET_PREFIX: process.env.ASSET_PREFIX || 'https://s3.amazonaws.com/app.topcoder.com/',
         auth0Callback: process.env.auth0Callback || 'https://api.topcoder.com/pub/callback.html',
         // auth0Callback: process.env.auth0Callback || 'https://www.topcoder.com/reg2/callback.action',
         auth0Domain: process.env.auth0Domain || 'topcoder.auth0.com',