diff --git a/lms/www/classes/index.html b/lms/www/classes/index.html
index 312d2eb8..26c6a9b7 100644
--- a/lms/www/classes/index.html
+++ b/lms/www/classes/index.html
@@ -120,11 +120,6 @@
 </div>
 {% endmacro %}
 
-{% block style %}
-	{{ super() }}
-	{{ include_style('controls.bundle.css') }}
-{% endblock %}
-
 {%- block script %}
     {{ super() }}
     {{ include_script('controls.bundle.js') }}
diff --git a/lms/www/classes/index.py b/lms/www/classes/index.py
index 379c481a..4e387678 100644
--- a/lms/www/classes/index.py
+++ b/lms/www/classes/index.py
@@ -13,11 +13,12 @@ def get_context(context):
 
 	past_classes, upcoming_classes = [], []
 	for class_ in classes:
-
+		print(class_.start_date)
 		if getdate(class_.start_date) < getdate():
 			past_classes.append(class_)
 		else:
 			upcoming_classes.append(class_)
 
-	context.past_classes = past_classes
-	context.upcoming_classes = upcoming_classes
+	context.past_classes = sorted(past_classes, key=lambda d: d.start_date)
+
+	context.upcoming_classes = sorted(upcoming_classes, key=lambda d: d.start_date)