diff --git a/app/submissions/submissions.routes.js b/app/submissions/submissions.routes.js
index 8e376b87b..a80987887 100644
--- a/app/submissions/submissions.routes.js
+++ b/app/submissions/submissions.routes.js
@@ -46,12 +46,12 @@
                 var isPhaseSubmission = _.some(challenge.currentPhases, function(phase) {
                   if (phase.phaseStatus === 'Open') {
                     if (phase.phaseType === 'Submission') {
-                      phaseType = 'Submission';
+                      phaseType = 'SUBMISSION';
                       phaseId = phase.id;
                       return true;
 
                     } else if (phase.phaseType === 'Checkpoint Submission') {
-                      phaseType = 'Checkpoint_Submission';
+                      phaseType = 'CHECKPOINT_SUBMISSION';
                       phaseId = phase.id;
                       return true;
                     }
diff --git a/app/submissions/submit-file/submit-file.jade b/app/submissions/submit-file/submit-file.jade
index 0ba83fa04..4e99a3be6 100644
--- a/app/submissions/submit-file/submit-file.jade
+++ b/app/submissions/submit-file/submit-file.jade
@@ -4,9 +4,9 @@
   .mobile-redirect__body
     p Our team is working hard on new features, and file upload currently only works on the web. Please open this page on your desktop if you want to create a submission.
 
-    a Learn more about formatting your submission file
+    a(ng-href="TODO: Need Link") Learn more about formatting your submission file
 
-    a.tc-btn.tc-btn-s(ng-click="'TODO: go back to challenge details'") Back to Challenge Details
+    a.tc-btn.tc-btn-s(ng-href="https://www.{{DOMAIN}}/challenge-details/{{submissions.challengeId}}/?type={{submissions.track}}") Back to Challenge Details
 
 .panel-body
   form.form-blocks(name="submissionForm", role="form", ng-submit="submissionForm.$valid && vm.uploadSubmission()", novalidate)
@@ -112,6 +112,8 @@
       .form-block__fields
         .fieldsets
           ng-form.fieldset(name="font{{$index + 1}}", ng-repeat="font in vm.submissionForm.fonts track by font.id")
+            label.tc-label Font Source
+
             dropdown(
               name="'font-source{{$index + 1}}'",
               options="vm.fontList{{$index + 1}}",
diff --git a/assets/css/submissions/submit-file.scss b/assets/css/submissions/submit-file.scss
index 11c5689ed..978edbea9 100644
--- a/assets/css/submissions/submit-file.scss
+++ b/assets/css/submissions/submit-file.scss
@@ -34,5 +34,15 @@
 }
 
 .submitterRank {
+  width: 100px;
   margin-top: 10px;
 }
+
+.Select {
+  max-width: 300px;
+  margin-bottom: 20px;
+}
+
+.tc-error-messages {
+  max-width: 500px;
+}