diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index ebe2bfa0..214e75e5 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -2013,6 +2013,6 @@ select {
 	visibility: visible;
 }
 
-.add-students .text-primary.link-option {
-	visibility: hidden;
+.add-students ul li:nth-last-child(-n+2) {
+	display: none;
 }
\ No newline at end of file
diff --git a/lms/www/classes/class.html b/lms/www/classes/class.html
index 0557a449..30b30f8e 100644
--- a/lms/www/classes/class.html
+++ b/lms/www/classes/class.html
@@ -245,13 +245,13 @@
 
 		<div class="live-class-panel">
 			{% if class.owner == frappe.session.user %}
-			<a class="btn btn-secondary btn-sm mr-2" href="{{ class.start_url }}">
+			<a class="btn btn-secondary btn-sm mr-2" target="_blank" href="{{ class.start_url }}">
 				{{ _("Start") }}
 			</a>
 			{% endif %}
 
 			{% if is_student %}
-			<a class="btn btn-secondary btn-sm mt-auto" href="{{ class.join_url }}">
+			<a class="btn btn-secondary btn-sm mt-auto" target="_blank" href="{{ class.join_url }}">
 				{{ _("Join Class") }}
 			</a>
 			{% endif %}
diff --git a/lms/www/classes/index.py b/lms/www/classes/index.py
index 483b54e9..aaba98c8 100644
--- a/lms/www/classes/index.py
+++ b/lms/www/classes/index.py
@@ -1,10 +1,12 @@
 import frappe
-from frappe import _
+from frappe.utils import getdate
 
 
 def get_context(context):
 	context.no_cache = 1
 
 	context.classes = frappe.get_all(
-		"LMS Class", fields=["name", "title", "start_date", "end_date"]
+		"LMS Class", {
+			"end_date": [">=", getdate()]
+		}, ["name", "title", "start_date", "end_date"]
 	)