diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index c5cde49a..661b863c 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -925,7 +925,7 @@ def get_payment_options(doctype, docname, phone, country):
 		"name": frappe.db.get_single_value("Website Settings", "app_name"),
 		"description": _("Payment for {0} course").format(details["title"]),
 		"order_id": order["id"],
-		"amount": order["amount"] * 100,
+		"amount": cint(order["amount"]) * 100,
 		"currency": order["currency"],
 		"prefill": {
 			"name": frappe.db.get_value("User", frappe.session.user, "full_name"),
@@ -1039,13 +1039,15 @@ def create_order(client, amount, currency):
 	try:
 		return client.order.create(
 			{
-				"amount": amount * 100,
+				"amount": cint(amount) * 100,
 				"currency": currency,
 			}
 		)
 	except Exception as e:
 		frappe.throw(
-			_("Error during payment: {0}. Please contact the Administrator.").format(e)
+			_(
+				"Error during payment: {0} Please contact the Administrator. Amount {1} Currency {2} Formatted {3}"
+			).format(e, amount, currency, cint(amount))
 		)
 
 
diff --git a/lms/www/batches/batch.js b/lms/www/batches/batch.js
index 155b762d..3ac054d2 100644
--- a/lms/www/batches/batch.js
+++ b/lms/www/batches/batch.js
@@ -812,7 +812,7 @@ const set_calendar_range = (calendar, events) => {
 		);
 		$(".calendar-range").text(`${calendar_date}`);
 
-		if (moment(events[0].date).isSameOrBefore(moment(calendar)))
+		if (moment(calendar_date).isSameOrBefore(moment(events[0].date)))
 			$("#prev-week").hide();
 		else $("#prev-week").show();
 
diff --git a/lms/www/cohorts/cohort.html b/lms/www/cohorts/cohort.html
index 7e1672a1..f604ce2d 100644
--- a/lms/www/cohorts/cohort.html
+++ b/lms/www/cohorts/cohort.html
@@ -6,8 +6,8 @@ course.title }} {% endblock %} {% block page_content %}
 	{{ frappe.db.count("Cohort Subgroup", {"cohort": cohort.name}) }} {{
 	_("Subgroups") }} | {{ frappe.db.count("Cohort Mentor", {"cohort":
 	cohort.name}) }} {{ _("Mentors") }} | {{ frappe.db.count("LMS Enrollment",
-	{"cohort": cohort.name}) }} {{ _("Students") }} | {{ frappe.db.count("Cohort
-	Join Request", {"cohort": cohort.name}) }} {{ _("Join Requests") }}
+	{"cohort": cohort.name}) }} {{ _("Students") }}
+	| {{ frappe.db.count("Cohort Join Request", {"cohort": cohort.name}) }} {{ _("Join Requests") }}
 </p>
 
 {% if is_mentor %} {% set sg = mentor.get_subgroup() %}
diff --git a/lms/www/cohorts/index.html b/lms/www/cohorts/index.html
index 55c3233f..c9d4f287 100644
--- a/lms/www/cohorts/index.html
+++ b/lms/www/cohorts/index.html
@@ -24,9 +24,9 @@ course.title }} {% endblock %} {% block page_content %} {% if cohorts %}
 		<p class="mb-0">
 			{{ frappe.db.count("Cohort Subgroup", {"cohort": cohort.name}) }} {{
 			_("Subgroups") }} | {{ frappe.db.count("Cohort Mentor", {"cohort":
-			cohort.name}) }} {{ _("Mentors") }} | {{ frappe.db.count("LMS
-			Enrollment", {"cohort": cohort.name}) }} {{ _("Students") }} | {{
-			frappe.db.count("Cohort Join Request", {"cohort": cohort.name}) }}
+			cohort.name}) }} {{ _("Mentors") }}
+			| {{ frappe.db.count("LMS Enrollment", {"cohort": cohort.name}) }} {{ _("Students") }}
+			| {{ frappe.db.count("Cohort Join Request", {"cohort": cohort.name}) }}
 			{{ _("Join Requests") }}
 		</p>