diff --git a/templates/base.html b/templates/base.html
index 49f5556..6b85bdf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -10,7 +10,7 @@
 {% block content %}
 <div class="container">
     <div class="row">
-        <div class="page-header col">
+        <div class="col">
             {% block page_header %}{% endblock %}
             <hr/>
         </div>
diff --git a/templates/download.html b/templates/download.html
index a7f1a2f..f1a7f0c 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -23,25 +23,26 @@
 
 {% block app_content %}
     <div class="row">
-        <div class="col col-xs-12 col-sm-6 col-md-6 col-lg-4">
+        <div class="col col-12 col-sm-6 col-md-6 col-lg-4">
         <div class='card card-body bg-light'>
 
-        <form class="form" method="post" role="form" novalidate>
+        <form method="post" role="form" novalidate>
 
         {{ form.hidden_tag() }}
 
         {{ wtf.form_errors(form, hiddens="only") }}
 
-        <div class="form-group required">
-            {{ form.start_time.label(class_="form-control-label") }}
-            <div class='input-group date' id='start_time_group' data-target-input="nearest">
+        <div class="form-group">
+            {{ form.start_time.label() }}
+            <div class='input-group' id='start_time_group' data-target-input="nearest">
                 <input name='start_time' id='start_time_'
-                    class="form-control datetimepicker-input {{"is-invalid" if form.start_time.errors else ""}}"
+                    class="form-control {{"is-invalid" if form.start_time.errors else ""}}"
                     type="text" data-target="#start_time_group"
                     placeholder="{{ form.start_time.format }}"
                     {% if form.start_time.data %}
                     value="{{ form.start_time.data.strftime(form.start_time.format) }}"
                     {% endif %}
+                    required
                 />
                 <div class="input-group-append" data-target="#start_time_group" data-toggle="datetimepicker">
                     <div class="input-group-text"><i class="fa fa-calendar"></i></div>
@@ -52,8 +53,8 @@
             {% endif %}
         </div>
 
-        <div class="form-group required">
-            {{ form.length.label(class_="form-control-label") }}
+        <div class="form-group">
+            {{ form.length.label() }}
             <div class='input-group'>
             {{ form.length(class_="form-control " + ("is-invalid" if form.length.errors else "")) }}
             <div class="input-group-append">
@@ -65,9 +66,7 @@
             </div>
         </div>
 
-        <div class="form-group required">
         {{ form.submit(class_="btn btn-primary") }}
-        </div>
 
         </form>