diff --git a/app/templates/admin_settings.html b/app/templates/admin_settings.html
index 6688802..d2c6361 100644
--- a/app/templates/admin_settings.html
+++ b/app/templates/admin_settings.html
@@ -110,7 +110,7 @@
 	        	</div>
 	    	</div>
 		</div>
-	  
+
 	    <!--/.Panel 2-->
 
 	    <!--Panel 3-->
@@ -122,11 +122,6 @@
 		                	<input type="checkbox" checked> <b>Allow users self-enroll.</b>
 		              	</label>
 		            </div>
-		            <div class="togglebutton">
-		                <label>
-		                	<input type="checkbox"> <b>Put the system in maintenance mode.</b>
-		              	</label>
-		            </div>
 		            <button type="button" class="btn btn-primary">Save changes</button>
 		        </div>
 		    </div>
diff --git a/app/templates/home.html b/app/templates/home.html
index 29b253c..3d310df 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -7,12 +7,12 @@
         <script type="text/javascript">
             {% if page_obj and paginator %}
                 var pageNum = {{ page_obj.number }}; // The latest page loaded
-                var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages    
+                var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
             {% else %}
                 var pageNum = 0 ; // The latest page loaded
                 var numberPages = 0 ; // Indicates the number of pages
             {% endif %}
-            
+
             var baseUrl = '{% url "app:index" %}';
 
             // loadOnScroll handler
@@ -55,6 +55,7 @@
 
             $(document).ready(function(){
                $(window).bind('scroll', loadOnScroll);
+               $.material.init();
             });
         </script>
     {% endif %}
diff --git a/core/templates/base.html b/core/templates/base.html
index 795d294..4a883ce 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -8,16 +8,16 @@
 <head>
 	<title>{{ title }}</title>
 
+            <!-- jQuery & jQuery UI -->
+            <script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>
+            <script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script>
+
 	<meta http-equiv="Cache-Control" content="no-cache, no-store" />
 	<link href="{% static 'img/topo-amadeus.png' %}" rel="shortcut icon" />
 	<!-- Roboto font -->
 	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
-	<!-- jQuery & jQuery UI -->
-	<script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script>
-
   	<!-- Bootstrap and themes (material) -->
 	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
 
@@ -25,7 +25,6 @@
 	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
 
-
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/bootstrap-datepicker.standalone.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/alertify.min.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}">
@@ -36,11 +35,9 @@
 	<script type="text/javascript" src="{% static 'material/js/ripples.js' %}"></script>
 	<script type="text/javascript" src="{% static 'material/js/ripples.min.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script>
-
 	{% with "js/vendor/locales/bootstrap-datepicker."|add:LANGUAGE_CODE|add:".js" as locale_datepicker %}
-		<script type="text/javascript" src="{% static locale_datepicker %}"></script>
+	<script type="text/javascript" src="{% static locale_datepicker %}"></script>
 	{% endwith %}
-
 	<script type="text/javascript" src="{% static 'js/vendor/alertify.min.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/vendor/jscookie.js' %}"></script>
 
@@ -50,11 +47,9 @@
 	<!-- Custom styles -->
   	<link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
 
-	<!-- Init material Bootstrap -->
-	<script type="text/javascript">$.material.init()</script>
-
 	<!--Javascript block for specific-app ones -->
 	<script src="{% static 'js/base/amadeus.js' %}"></script>
+      <script src="{% static 'js/main.js' %}"></script>
 	{% block style %}
 	{% endblock %}
 	{% block javascript %}
@@ -172,8 +167,7 @@
 			</div>
 		</div>
 	</div>
-	<script src="{% static 'js/main.js' %}"></script>
-	<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
+
 	{% block script_file %}
 
 	{% endblock script_file %}
@@ -181,6 +175,8 @@
 	{% block script_link %}
 
 	{% endblock script_link %}
+      <!-- Init material Bootstrap -->
+      <script type="text/javascript">$.material.init()</script>
 </body>
 
 </html>
diff --git a/core/templates/index.html b/core/templates/index.html
index 4341c21..2306faa 100644
--- a/core/templates/index.html
+++ b/core/templates/index.html
@@ -49,7 +49,7 @@
                                     <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10 col-lg-offset-1">
                                       <div class="checkbox">
                                         <label>
-                                            <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
+                                            <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"></span> {% trans 'Remember Email' %}
                                         </label>
                                       </div>
                                     </div>
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index 4917e99..70cb867 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -10,6 +10,7 @@
 {% block javascript %}
   <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/modal_subject.js' %}"></script>
+  <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
 {% endblock %}
 
 {% block breadcrumbs %}
diff --git a/users/templates/users/edit_profile.html b/users/templates/users/edit_profile.html
index 3bfb722..9df02cd 100644
--- a/users/templates/users/edit_profile.html
+++ b/users/templates/users/edit_profile.html
@@ -8,11 +8,11 @@
 {% block breadcrumbs %}
 	{% if user|has_role:'system_admin' %}
 		{{ block.super }}
-    	{% breadcrumb 'Update User' 'users:update' %}	
+    	{% breadcrumb 'Update User' 'users:update' %}
 	{% else %}
 		{{ block.super }}
 		{% breadcrumb 'Update Profile' 'users:update' %}
-	{% endif %}  	
+	{% endif %}
 
 {% endblock %}
 
@@ -28,7 +28,6 @@
 			</div>
 		{% endfor %}
 	{% endif %}
-
 	<div class="card mg-b-5m">
 		<div class="card-content">
 			<div class="card-body">
@@ -57,7 +56,7 @@
 
                 			{% elif field.auto_id == 'id_phone' %}
                 				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
-							
+
 							{% elif field.auto_id == 'id_year_titration' %}
 								{% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
 
--
libgit2 0.21.2