diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index c985aea4..5fd470e0 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -384,7 +384,6 @@ input[type=checkbox] {
 	text-overflow: ellipsis;
 	width: 100%;
 	overflow: hidden;
-	white-space: nowrap;
 	margin-bottom: 1.25rem;
 }
 
@@ -1904,10 +1903,6 @@ li {
 	padding: 0 1rem !important;
 }
 
-.modal-dialog-scrollable .modal-body {
-	overflow-y: unset;
-}
-
 .modal-dialog-scrollable .modal-content {
 	overflow: unset;
 }
diff --git a/lms/www/classes/class.js b/lms/www/classes/class.js
index d51442da..0c8d99d6 100644
--- a/lms/www/classes/class.js
+++ b/lms/www/classes/class.js
@@ -309,6 +309,9 @@ const show_course_modal = () => {
 		},
 	});
 	course_modal.show();
+	setTimeout(() => {
+		$(".modal-body").css("min-height", "200px");
+	}, 1000);
 };
 
 const add_course = (values) => {
@@ -380,6 +383,9 @@ const show_student_modal = () => {
 		},
 	});
 	student_modal.show();
+	setTimeout(() => {
+		$(".modal-body").css("min-height", "200px");
+	}, 1000);
 };
 
 const add_student = (values) => {
@@ -457,6 +463,29 @@ const show_assessment_modal = (e) => {
 				fieldname: "assessment_name",
 				reqd: 1,
 			},
+			{
+				fieldtype: "Section Break",
+				label: __("OR"),
+			},
+			{
+				fieldtype: "Button",
+				label: __("Create Assignment"),
+				fieldname: "create_assignment",
+				click: () => {
+					window.location.href = "/assignments";
+				},
+			},
+			{
+				fieldtype: "Column Break",
+			},
+			{
+				fieldtype: "Button",
+				label: __("Create Quiz"),
+				fieldname: "create_quiz",
+				click: () => {
+					window.location.href = "/quizzes";
+				},
+			},
 		],
 		primary_action_label: __("Add"),
 		primary_action(values) {
@@ -465,6 +494,9 @@ const show_assessment_modal = (e) => {
 		},
 	});
 	assessment_modal.show();
+	setTimeout(() => {
+		$(".modal-body").css("min-height", "300px");
+	}, 1000);
 };
 
 const add_addessment = (values) => {
diff --git a/lms/www/classes/progress.html b/lms/www/classes/progress.html
index 40eaa580..84d030b9 100644
--- a/lms/www/classes/progress.html
+++ b/lms/www/classes/progress.html
@@ -7,7 +7,7 @@
 {% block page_content %}
 <div class="common-page-style">
 	{{ Header() }}
-	<div class="container form-width">
+	<div class="container">
 		{{ Progress(class_info, student) }}
 	</div>
 </div>
@@ -15,7 +15,7 @@
 
 {% macro Header() %}
 <header class="sticky mb-5">
-	<div class="container form-width">
+	<div class="container">
 		<div class="edit-header">
 			<div>
 				<div class="page-title">
@@ -60,10 +60,10 @@
 				<div class="col grid-static-col">
 					{{ _("Assessment") }}
 				</div>
-				<div class="col grid-static-col">
+				<div class="col grid-static-col col-xs-2">
 					{{ _("Type") }}
 				</div>
-				<div class="col grid-static-col">
+				<div class="col grid-static-col col-xs-2">
 					{{ _("Status/Score") }}
 				</div>
 			</div>
@@ -76,11 +76,11 @@
 			<a class="col grid-static-col {% if has_access %} clickable {% endif %}" {% if has_access %} href="{{ assessment.url }}" {% endif %}>
 				{{ assessment.title }}
 			</a>
-			<div class="col grid-static-col">
+			<div class="col grid-static-col col-xs-2">
 				{{ (assessment.assessment_type).split("LMS ")[1] }}
 			</div>
 
-			<div class="col grid-static-col mb-2">
+			<div class="col grid-static-col col-xs-2 mb-2">
 				{% if assessment.submission %}
 					{% if assessment.assessment_type == "LMS Assignment" %}
 						{% set status = assessment.submission.status %}