diff --git a/circle/dashboard/templates/base.html b/circle/dashboard/templates/base.html
index aede030..d5cebfb 100644
--- a/circle/dashboard/templates/base.html
+++ b/circle/dashboard/templates/base.html
@@ -1,4 +1,6 @@
 {% load i18n %}
+{% load staticfiles %}
+{% load compressed %}
 <!DOCTYPE html>
 <html lang="{{lang}}">
   <head>
@@ -6,14 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="icon" type="image/png" href="{{ STATIC_URL}}dashboard/img/favicon.png"/>
+    <link rel="icon" type="image/png" href="{% static "dashboard/img/favicon.png" %}"/>
 
     <title>{% block title %}{% block title-page %}{% endblock %} | {% block title-site %}CIRCLE{% endblock %}{% endblock %}</title>
 
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css">
-    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="{{ STATIC_URL }}/template.css">
+    {% compressed_css 'all' %}
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
@@ -67,9 +66,8 @@
     </footer>
   </body>
 
-  <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
-  <script src="{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider/js/simple-slider.js"></script>
-  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+  <script src="{% static "jquery/dist/jquery.min.js" %}"></script>
+  {% compressed_js 'all' %}
   <script src="{{ STATIC_URL }}jsi18n/{{ LANGUAGE_CODE }}/djangojs.js"></script>
   {% include 'autocomplete_light/static.html' %}
 
diff --git a/circle/dashboard/templates/dashboard/base.html b/circle/dashboard/templates/dashboard/base.html
index a4b32e6..78b3277 100644
--- a/circle/dashboard/templates/dashboard/base.html
+++ b/circle/dashboard/templates/dashboard/base.html
@@ -4,12 +4,6 @@
 {% block title-site %}Dashboard | CIRCLE{% endblock %}
 
 
-{% block extra_link %}
-  <link rel="stylesheet" href="{{ STATIC_URL }}dashboard/loopj-jquery-simple-slider/css/simple-slider.css"/>
-  <link href="{{ STATIC_URL }}dashboard/bootstrap-tour.min.css" rel="stylesheet">
-  <link href="{{ STATIC_URL }}dashboard/dashboard.css" rel="stylesheet">
-{% endblock %}
-
 
 {% block navbar-brand %}
   <a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
@@ -51,9 +45,3 @@
 {% endif %}
 
 {% endblock %}
-
-
-{% block extra_script %}
-  <script src="{{ STATIC_URL }}dashboard/js/jquery.knob.js"></script>
-  <script src="{{ STATIC_URL }}dashboard/dashboard.js"></script>
-{% endblock %}
