Merge branch 'student-form-upload-instructions'.
diff --git a/app/soc/content/js/upload-form.js b/app/soc/content/js/upload-form.js
index 4b5950e..79e9bee 100644
--- a/app/soc/content/js/upload-form.js
+++ b/app/soc/content/js/upload-form.js
@@ -71,9 +71,10 @@
         formrow.children('.progress').hide();
         var filedownload = formrow.children('.filedownload');
         filedownload.children('.filename').html(data.files[0].name);
-        filedownload.show();
         filedownload.children('.verified').addClass('button-hide');
         filedownload.children('.to_be_verified').removeClass('button-hide');
+        filedownload.removeClass('button-hide');
+        filedownload.show();
       }
     });
   }
diff --git a/app/soc/templates/v2/modules/gci/form_base.html b/app/soc/templates/v2/modules/gci/form_base.html
index 555cb6b..15915b4 100644
--- a/app/soc/templates/v2/modules/gci/form_base.html
+++ b/app/soc/templates/v2/modules/gci/form_base.html
@@ -19,6 +19,8 @@
 {% endblock stylesheets %}
 
 {% block page_content %}
+
+{% block formsave_msg %}
 {% if posted %}
   <div class="block block-user-message">
   {% if error %}
@@ -28,6 +30,7 @@
   {% endif %}
   </div>
 {% endif %}
+{% endblock formsave_msg %}
 
 <div class="block block-form">
   <div class="block-form-title">
diff --git a/app/soc/templates/v2/modules/gci/profile/base.html b/app/soc/templates/v2/modules/gci/profile/base.html
index d68e13a..6f90044 100644
--- a/app/soc/templates/v2/modules/gci/profile/base.html
+++ b/app/soc/templates/v2/modules/gci/profile/base.html
@@ -18,6 +18,18 @@
   <link rel="stylesheet" type="text/css" media="screen" href="/{{ css_path }}/dd.css" />
 {% endblock stylesheets %}
 
+{% block formsave_msg %}
+{% if posted %}
+  <div class="block block-user-message">
+  {% if error %}
+      <p>Sorry, we could not save your profile. Please fix the errors mentioned below.</p>
+  {% else %}
+      <p>Profile saved successfully. {{ form_instructions|safe }}</p>
+  {% endif %}
+  </div>
+{% endif %}
+{% endblock formsave_msg %}
+
 {% block form_button %}
   {{ block.super }}
   {% if edit_profile %}
@@ -25,14 +37,6 @@
   {% endif %}
 {% endblock form_button %}
 
-{% block form_instruction %}
-  {% if form_instructions %}
-  <div>
-    <p><strong>{{ form_instructions|safe }}</strong></p>
-  </div>
-  {% endif %}
-{% endblock form_instruction %}
-
 {% block dependencies %}
   [
     dep.uniform,