diff --git a/django/website/hid/static/hid/js/messages.js b/django/website/hid/static/hid/js/messages.js
index 19a97269b2dac873934f8b92a5039d95c28feede..edaf82f114bcad7c2bd12adef07f9df22c2daa50 100644
--- a/django/website/hid/static/hid/js/messages.js
+++ b/django/website/hid/static/hid/js/messages.js
@@ -4,7 +4,8 @@
 
 jQuery(window).load(function(){
   setTimeout(function(){ 
-      jQuery('.messages-box > ul').fadeOut();
+      jQuery('.messages-box > ul').fadeOut(3000, 'swing');
       }, 3000);
 });
 
+
diff --git a/django/website/hid/templates/hid/sources.html b/django/website/hid/templates/hid/sources.html
index 09ba78cd883b99efc7af6c7fce711d7b77dc6d34..f3f6d59eafee5ad7f9dd06445d17de99199d53d9 100644
--- a/django/website/hid/templates/hid/sources.html
+++ b/django/website/hid/templates/hid/sources.html
@@ -15,7 +15,7 @@
                 {% csrf_token %}
                 <a class="btn btn-primary btn-block btn-sm" value="View/Edit data" type="button" href="{% url "data-view" %}"><span class="fa fa-pencil fa-fw"></span> View &amp; Edit data</a>
                 {% bootstrap_form source.form show_label=False %}
-                <a class="btn-sm item-source-upload btn-block btn-primary" type="button" value="Upload" href="{% url "data-view" %}"><span class="fa fa-upload fa-fw"></span> Upload</a>
+                <a class="btn btn-sm item-source-upload btn-block btn-primary" type="button" value="Upload" href="{% url "data-view" %}"><span class="fa fa-upload fa-fw"></span> Upload</a>
             </form>
         </li>
         {% endfor %}
diff --git a/django/website/hid/templates/hid/view.html b/django/website/hid/templates/hid/view.html
index 290bfdc705637b5e3ab64a3e99995e33e5d3154d..b8276716897bb3df8be68d4a452764527e9a7d44 100644
--- a/django/website/hid/templates/hid/view.html
+++ b/django/website/hid/templates/hid/view.html
@@ -4,12 +4,6 @@
 {% load render_table from django_tables2 %}
 
 {% block maincontent %}
-<ul class="nav nav-pills navbar-right nav-hanging-tabs">
-    <li class="active"><a href="#home" data-toggle="tab">All</a></li>
-    <li><a href="#profile" data-toggle="tab">Questions</a></li>
-    <li><a href="#profile" data-toggle="tab">Rumors</a></li>
-
-</ul>
 <h1 class="page-header"><span class="fa fa-pencil fa-fw"></span>{% trans "View &amp; Edit" %}</h1>
  <div class='row'>
     <div class="col-lg-12">
diff --git a/django/website/media/css/styles.css b/django/website/media/css/styles.css
index 6d1f7fe873e42812e8f288bbf4a0b01de43e1e51..c68d5f9f456bf89e3e9d8675bb2c6efb65ed9ad1 100644
--- a/django/website/media/css/styles.css
+++ b/django/website/media/css/styles.css
@@ -6485,6 +6485,9 @@ body {
   -o-box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
   box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
 }
+.page-header {
+  margin-top: 0;
+}
 @media (min-width: 768px) {
   #page-wrapper {
     position: inherit;
@@ -6594,9 +6597,6 @@ body {
 .sidebar .sidebar-search {
   padding: 15px;
 }
-.sidebar ul li a.active {
-  background-color: #edecec;
-}
 .sidebar .arrow {
   float: right;
 }
@@ -6986,8 +6986,7 @@ a.list-group-item-danger.active:focus {
   color: #282625;
 }
 .nav-hanging-tabs {
-  margin-top: 40px;
-  margin-right: 0;
+  margin: 0;
 }
 .nav-hanging-tabs > li > a {
   background-color: rgba(0, 0, 0, 0.05);
@@ -7030,10 +7029,12 @@ th.delete > label {
   padding: 10px;
 }
 .messages-box {
-  margin: 0;
+  margin: 20px 0 0;
+  position: relative;
+  min-height: 30px;
 }
 .messages-box > ul {
-  margin-top: 40px;
+  margin-top: 15px;
   color: #fff;
 }
 .messages-box > ul > li {
@@ -7052,18 +7053,19 @@ th.delete > label {
   display: none;
 }
 .spinner {
-  display: none;
-  height: 50px;
-  margin: 20px auto 0;
+  bottom: 0;
+  height: 25px;
+  margin: 0 auto;
   position: absolute;
   text-align: center;
-  bottom: 20px;
+  top: 15px;
   width: 100%;
+  display: none;
 }
 .spinner > span {
   display: inline-block;
   position: relative;
-  top: -20px;
+  top: -8px;
 }
 .spinner > div {
   height: 100%;
diff --git a/django/website/media/less/internews.less b/django/website/media/less/internews.less
index 2529c41ca31f1ec354b4830d39f6a25d1f5af3e7..082f354c5240e7b24da9b1626f1e4c4a0f9efa3c 100644
--- a/django/website/media/less/internews.less
+++ b/django/website/media/less/internews.less
@@ -17,6 +17,10 @@ body {
     .box-shadow-inset(inset, 0px, 0px); 
 }
 
+.page-header {
+  margin-top:0;
+}
+
 @media(min-width:768px) {
     #page-wrapper {
         position: inherit;
@@ -158,14 +162,6 @@ body {
     padding: 15px;
 }
 
-.sidebar ul li {
-    a {
-        &.active {
-            background-color: @gray-lighter;
-        }
-    }
-}
-
 .sidebar .arrow {
     float: right;
 }
diff --git a/django/website/media/less/spinner.less b/django/website/media/less/spinner.less
index 9663375fc5b6741e62689f3b05f8a7a670344b8d..deb637931a7aeca2da553e9c8804714bb4ca1b5f 100644
--- a/django/website/media/less/spinner.less
+++ b/django/website/media/less/spinner.less
@@ -1,15 +1,20 @@
 //loading spinner
 
 .spinner {
-    display: none;
-    height: 50px;
-    margin: 40px auto 0;
-    width: 120px;
+    bottom: 0;
+    height: 25px;
+    margin: 0 auto;
+    position: absolute;
+    text-align: center;
+    top: 15px;
+    width: 100%;
+    display:none;
 }
 
 .spinner > span {
-    display: block;
-    float: left;
+    display: inline-block;
+    position: relative;
+    top: -8px;
 }
 
 .spinner > div {
diff --git a/django/website/media/less/view-edit.less b/django/website/media/less/view-edit.less
index 5e43a0d4fc7cc48adecdcfae48494e3d13231422..2cad305f0c02470bd0641c9a81ee06925abe49ff 100644
--- a/django/website/media/less/view-edit.less
+++ b/django/website/media/less/view-edit.less
@@ -3,8 +3,7 @@
 //link navigation
 
 .nav-hanging-tabs {
-  margin-top:40px;
-  margin-right:0;
+  margin:0;
 }
 
 .nav-hanging-tabs > li > a {
@@ -53,11 +52,13 @@ th.delete > label {
 }
 
 .messages-box {
-  margin:0;
+  margin: 20px 0 0;
+  position: relative;
+  min-height: 30px;
 }
 
 .messages-box > ul {
-  margin-top:40px;
+  margin-top:15px;
   color:#fff;
 }