diff --git a/templates/base.html b/templates/base.html
index 350f42b..a92a9ea 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,8 +24,6 @@
     {% block css %}{% endblock %}
 
     {% block js %}{% endblock %}
-
-    {% block media %}{% endblock %}
   </head>
 
   <body>
diff --git a/templates/base_error.html b/templates/base_error.html
index fe0254c..968c996 100644
--- a/templates/base_error.html
+++ b/templates/base_error.html
@@ -22,11 +22,7 @@
     <link href="{% static 'css/ponytracker.css' %}" rel="stylesheet">
     {% block css %}{% endblock %}
 
-    <script src="{% bootstrap_jquery_url %}"></script>
-    {% bootstrap_javascript %}
     {% block js %}{% endblock %}
-
-    {% block media %}{% endblock %}
   </head>
 
   <body>
@@ -62,6 +58,8 @@
 
     </div> <!-- /container -->
 
+    <script src="{% bootstrap_jquery_url %}"></script>
+    {% bootstrap_javascript %}
     <script src="{% static 'js/ponytracker.js' %}"></script>
     {% block js_end %}{% endblock %}
   </body>
diff --git a/templates/tracker/issue_details.html b/templates/tracker/issue_details.html
index 26a3efa..79a9bf3 100644
--- a/templates/tracker/issue_details.html
+++ b/templates/tracker/issue_details.html
@@ -5,8 +5,8 @@
 {% load tracker_filters %}
 {% load staticfiles %}
 
-{% block media %}
-{{ form.media }}
+{% block css %}
+{{ form.media.css }}
 {% endblock %}
 
 {% block tabcontent %}
@@ -227,4 +227,5 @@ var markdown_preview_url = "{% url 'markdown' %}";
 </script>
 <script src="{% static 'js/jquery.cookie.js' %}"></script>
 <script src="{% static 'js/markdown-preview.js' %}"></script>
+{{ form.media.js }}
 {% endblock %}
diff --git a/templates/tracker/milestone_edit.html b/templates/tracker/milestone_edit.html
index 92c115c..34af640 100644
--- a/templates/tracker/milestone_edit.html
+++ b/templates/tracker/milestone_edit.html
@@ -4,6 +4,11 @@
 
 {% block milestonetab %} class="active"{% endblock %}
 
+{% block css %}
+{{ block.super }}
+{{ form.media.css }}
+{% endblock %}
+
 {% block moretabs %}
 <div class="pull-right">
   <div class="btn-group">
@@ -17,10 +22,6 @@
 </div>
 {% endblock %}
 
-{% block media %}
-{{ form.media }}
-{% endblock %}
-
 {% block tabcontent %}
 
 <div class="row">
@@ -49,3 +50,13 @@
 </div>
 
 {% endblock %}
+
+{% block js_end %}
+{{ block.super }}
+{{ form.media.js }}
+<script>
+$(function() {
+    $("#id_due_date_picker").datetimepicker({"format": "YYYY-MM-DD HH:mm", "language": "en-us"});
+});
+</script>
+{% endblock %}
diff --git a/tracker/forms.py b/tracker/forms.py
index fefbd9f..425035c 100644
--- a/tracker/forms.py
+++ b/tracker/forms.py
@@ -40,5 +40,5 @@ class MilestoneForm(forms.ModelForm):
         model = Milestone
         fields = ['name', 'due_date']
         widgets = {
-            'due_date': DateTimePicker(format="%Y-%m-%d %H:%M"),
+            'due_date': DateTimePicker(options=False),
         }
