diff --git a/todo/media/todo/css/styles.css b/todo/static/todo/css/styles.css
similarity index 100%
rename from todo/media/todo/css/styles.css
rename to todo/static/todo/css/styles.css
diff --git a/todo/media/todo/css/ui.datepicker.css b/todo/static/todo/css/ui.datepicker.css
similarity index 100%
rename from todo/media/todo/css/ui.datepicker.css
rename to todo/static/todo/css/ui.datepicker.css
diff --git a/todo/media/todo/js/jquery.tablednd_0_5.js b/todo/static/todo/js/jquery.tablednd_0_5.js
similarity index 100%
rename from todo/media/todo/js/jquery.tablednd_0_5.js
rename to todo/static/todo/js/jquery.tablednd_0_5.js
diff --git a/todo/templates/todo/base.html b/todo/templates/todo/base.html
index 7f8ef11..d996c33 100644
--- a/todo/templates/todo/base.html
+++ b/todo/templates/todo/base.html
@@ -2,11 +2,11 @@
 {% block page_heading %}GTD (Getting Things Done){% endblock %}
 {% block extrahead %}
 <!-- CSS and JavaScript for django-todo -->
-<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}todo/css/styles.css" />
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}todo/css/styles.css" />
 
-<script src="{{MEDIA_URL}}js/ui.datepicker.js" type="text/javascript"></script>
-<script src="{{MEDIA_URL}}todo/js/jquery.tablednd_0_5.js" type="text/javascript"></script> 
-<link type="text/css" href="{{MEDIA_URL}}js/jquery-ui-1.7.1.custom.css" rel="Stylesheet" />
+<script src="{{STATIC_URL}}js/ui.datepicker.js" type="text/javascript"></script>
+<script src="{{STATIC_URL}}todo/js/jquery.tablednd_0_5.js" type="text/javascript"></script> 
+<link type="text/css" href="{{STATIC_URL}}js/jquery-ui-1.7.1.custom.css" rel="Stylesheet" />
 
 <script type="text/javascript" charset="utf-8">
     // thedate.x comes from the edit_task view. If this is a new entry,