diff --git a/django/website/templates/Copy of base_side.html b/django/website/templates/Copy of base_side.html
index 89d7fcc404f0ad8abd39a0604c12865b71469dac..ffdbfda988570ce3b06c4950139b6b58ce1a8f33 100644
--- a/django/website/templates/Copy of base_side.html	
+++ b/django/website/templates/Copy of base_side.html	
@@ -2,20 +2,20 @@
 {% load i18n %}
 {% block content %}
 <!-- Navigation -->
-	<div class="navbar-default sidebar" role="navigation">
-		<div class="featured-image">
+    <div class="navbar-default sidebar" role="navigation">
+        <div class="featured-image">
                <img class="img-responsive" src="{{ STATIC_URL }}images/rsz_west-african-girl.jpg" alt="West African girl" />
             </div>
-    	<nav class="sidebar-nav navbar-collapse">
+        <nav class="sidebar-nav navbar-collapse">
             <ul class="nav" id="side-menu">
-            	<li><a href="{% url "dashboard" %}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
-            	<li><a href="{% url "sources" %}"><i class="fa fa-download fa-fw"></i> Sources</a></li>
+                <li><a href="{% url "dashboard" %}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
+                <li><a href="{% url "sources" %}"><i class="fa fa-download fa-fw"></i> Sources</a></li>
                 <li><a href="{% url "data-view" %}"><i class="fa fa-pencil fa-fw"></i> View &amp; Edit</a></li>
             </ul>
         </nav>
         <div class="site-info">
            <p>An <a href="http://www.internews.org" title="Internews website">Internews project</a><br />
-           	Site by<a href="http://www.aptivate.org" title="Aptivate website"> Aptivate</a></p>
+            Site by<a href="http://www.aptivate.org" title="Aptivate website"> Aptivate</a></p>
         </div>
         <!-- /.sidebar-collapse -->
     </div>
@@ -28,7 +28,7 @@
             <a class="navbar-brand pull-left" href="/">{% trans "HID  " %}<span class="subtitle">{% trans "Humanitarian Information Dashboard" %}</span></a>
         </div>
         <!-- /.navbar-header -->
-    	{% if request.user.is_authenticated %}
+        {% if request.user.is_authenticated %}
         <ul class="nav navbar-top-links navbar-right">
             <li class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">
@@ -43,25 +43,25 @@
         </ul>
         {% endif %}
         <!-- /.navbar-top-links -->
-	</nav>
+    </nav>
     <!-- /Navigation -->
     <!-- Main Content -->
     <div id="page-wrapper">
         <div class="row">
             <div class="col-lg-12">
-            	<div class="row messages-box">
-            	{% if messages %}
-			        <ul class="list-unstyled">
-			            {% for message in messages %}
-			            <li{% if message.tags %} class="alert {{ message.tags }} {% if message.tags == "error" %}bg-danger{% else %}bg-success{% endif %}"{% endif %}>{{ message }}</li>
-			            {% endfor %}
-			        </ul>
-			       {% endif %}
-			    </div>
-            	{% block maincontent %}
-            	{% endblock maincontent %}
-        	</div>
+                <div class="row messages-box">
+                {% if messages %}
+                    <ul class="list-unstyled">
+                        {% for message in messages %}
+                        <li{% if message.tags %} class="alert {{ message.tags }} {% if message.tags == "error" %}bg-danger{% else %}bg-success{% endif %}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                   {% endif %}
+                </div>
+                {% block maincontent %}
+                {% endblock maincontent %}
+            </div>
         </div>
-	</div>
-	<!-- /Main Content -->
+    </div>
+    <!-- /Main Content -->
 {% endblock content %}
diff --git a/django/website/templates/base_side.html b/django/website/templates/base_side.html
index 9c2da739c28c362ef025b9bbb567a078d832cde3..1eb36a2990eccf285897e0ad4084665a4fc6e85e 100644
--- a/django/website/templates/base_side.html
+++ b/django/website/templates/base_side.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% block content %}
 <!-- Navigation -->
-	<div class="navbar-default sidebar" role="navigation">
-		<div class="featured-image">
+    <div class="navbar-default sidebar" role="navigation">
+        <div class="featured-image">
                <img class="img-responsive" src="{{ STATIC_URL }}images/rsz_west-african-girl.jpg" alt="West African girl" />
             </div>
-    	<nav class="sidebar-nav navbar-collapse">
+        <nav class="sidebar-nav navbar-collapse">
             <ul class="nav" id="side-menu">
                 <li><a class="active" href="{% url "dashboard" %}"><span class="fa fa-dashboard fa-fw"></span> Dashboard</a></li>
                 <li><a href="{% url "sources" %}"><span class="fa fa-download fa-fw"></span> Sources</a></li>
@@ -15,7 +15,7 @@
         </nav>
         <div class="site-info">
            <p>a project of <a href="http://www.internews.org" title="Internews website">Internews</a><br />
-           	developed by<a href="http://www.aptivate.org" title="Aptivate website"> Aptivate</a></p>
+            developed by<a href="http://www.aptivate.org" title="Aptivate website"> Aptivate</a></p>
         </div>
         <!-- /.sidebar-collapse -->
     </div>
@@ -28,7 +28,7 @@
             <a class="navbar-brand pull-left" href="/">{% trans "HID  " %}<span class="subtitle">{% trans "Humanitarian Information Dashboard" %}</span></a>
         </div>
         <!-- /.navbar-header -->
-    	{% if request.user.is_authenticated %}
+        {% if request.user.is_authenticated %}
         <ul class="nav navbar-top-links navbar-right">
             <li class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">
@@ -43,34 +43,34 @@
         </ul>
         {% endif %}
         <!-- /.navbar-top-links -->
-	</nav>
+    </nav>
     <!-- /Navigation -->
     <!-- Main Content -->
     <div id="page-wrapper">
         <div class="row">
             <div class="col-lg-12">
-            	<div class="row messages-box">
-            		<div class="spinner">
-            			<span>loading...</span>
-					  <div class="rect1"></div>
-					  <div class="rect2"></div>
-					  <div class="rect3"></div>
-					  <div class="rect4"></div>
-					  <div class="rect5"></div>
-					</div>
-            	{% if messages %}
-			        <ul class="list-unstyled">
-			            {% for message in messages %}
-			            <li{% if message.tags %} class="alert {{ message.tags }} {% if message.tags == "error" %}bg-danger{% else %}bg-success{% endif %}"{% endif %}>{{ message }}</li>
-			            {% endfor %}
-			        </ul>
-			       {% endif %}
-			    </div>
-            	{% block maincontent %}
-            	{% endblock maincontent %}
-        	</div>
+                <div class="row messages-box">
+                    <div class="spinner">
+                        <span>loading...</span>
+                      <div class="rect1"></div>
+                      <div class="rect2"></div>
+                      <div class="rect3"></div>
+                      <div class="rect4"></div>
+                      <div class="rect5"></div>
+                    </div>
+                {% if messages %}
+                    <ul class="list-unstyled">
+                        {% for message in messages %}
+                        <li{% if message.tags %} class="alert {{ message.tags }} {% if message.tags == "error" %}bg-danger{% else %}bg-success{% endif %}"{% endif %}>{{ message }}</li>
+                        {% endfor %}
+                    </ul>
+                   {% endif %}
+                </div>
+                {% block maincontent %}
+                {% endblock maincontent %}
+            </div>
         </div>
-	</div>
-	<!-- /Main Content -->
+    </div>
+    <!-- /Main Content -->
 {% endblock content %}
 
diff --git a/django/website/users/templates/registration/login.html b/django/website/users/templates/registration/login.html
index a36506c78ee5745a9af5e7e196be465e3ffedaed..8e923e0b41d98f5c3e588b639597d80cc2cfb7d4 100644
--- a/django/website/users/templates/registration/login.html
+++ b/django/website/users/templates/registration/login.html
@@ -6,7 +6,7 @@
 {% block maincontent %}
     <div class="col-md-4 col-md-offset-4">
         <div class="login-panel panel panel-default login-form modal-content">
-        	<div class="panel-heading">
+            <div class="panel-heading">
                 <h1 class="panel-title"><i class="fa fa-user fa-fw"></i> HID login</h1>
             </div>
             <div class="form-group panel-body">