diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py
index 7cc082a4..2d56bd63 100644
--- a/lms/lms/doctype/lms_course/lms_course.py
+++ b/lms/lms/doctype/lms_course/lms_course.py
@@ -5,7 +5,7 @@ import json
 import random
 import frappe
 from frappe.model.document import Document
-from frappe.utils import cint
+from frappe.utils import cint, validate_phone_number
 from frappe.utils.telemetry import capture
 from lms.lms.utils import get_chapters, can_create_courses
 from ...utils import generate_slug, validate_image
@@ -213,6 +213,9 @@ def save_course(
 	published,
 	upcoming,
 	image=None,
+	paid_course=False,
+	course_price=None,
+	currency=None,
 ):
 	if not can_create_courses():
 		return
@@ -232,6 +235,9 @@ def save_course(
 			"tags": tags,
 			"published": cint(published),
 			"upcoming": cint(upcoming),
+			"paid_course": cint(paid_course),
+			"course_price": course_price,
+			"currency": currency,
 		}
 	)
 	doc.save(ignore_permissions=True)
@@ -360,6 +366,7 @@ def reorder_chapter(chapter_array):
 
 @frappe.whitelist()
 def get_payment_options(course, phone):
+	validate_phone_number(phone, True)
 	course_details = frappe.db.get_value(
 		"LMS Course", course, ["name", "title", "currency", "course_price"], as_dict=True
 	)
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index d472e6cf..0758d0c5 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -475,7 +475,7 @@ def get_evaluation_details(course, member=None):
 def format_amount(amount, currency):
 	amount_reduced = amount / 1000
 	if amount_reduced < 1:
-		return amount
+		return fmt_money(amount, 0, currency)
 	precision = 0 if amount % 1000 == 0 else 1
 	return _("{0}k").format(fmt_money(amount_reduced, precision, currency))
 
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index c3768a6c..823b9e52 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -421,7 +421,7 @@ input[type=checkbox] {
 }
 
 .course-price {
-	font-weight: 700;
+	font-weight: 500;
 }
 
 .view-course-link {
diff --git a/lms/templates/reviews_cta.html b/lms/templates/reviews_cta.html
index 73bd63a7..dfb06f44 100644
--- a/lms/templates/reviews_cta.html
+++ b/lms/templates/reviews_cta.html
@@ -2,7 +2,7 @@
     <span class="btn btn-secondary btn-sm review-link">
         {{ _("Write a review") }}
     </span>
-{% elif not is_instructor(course.name) and frappe.session.user == "Guest" %}
+{% elif not is_instructor and frappe.session.user == "Guest" %}
     <a class="btn btn-secondary btn-sm" href="/login?redirect-to=/courses/{{ course.name }}">
         {{ _("Write a review") }}
     </a>
diff --git a/lms/www/billing/__init__.py b/lms/www/billing/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/lms/www/billing/billing.html b/lms/www/billing/billing.html
index 373461d9..31e84e04 100644
--- a/lms/www/billing/billing.html
+++ b/lms/www/billing/billing.html
@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% macro Header() %}
-<div class="px-4">
+<div class="px-4 pb-2">
     <div class="page-title">
         {{ _("Order Details") }}
     </div>
@@ -26,25 +26,18 @@
 {% endmacro %}
 
 {% macro CourseDetails() %}
-<div class="px-4 pt-10 pb-8 border-bottom">
-    <div class="flex justify-between">
-        <div class="">
-            {{ _("Course:") }}
+<div class="px-4 pt-5 border-top">
+    <div class="">
+        <div class="flex mb-2">
+            <div class="field-label">
+                {{ _("Course Name: ") }} {{ course.title }}
+            </div>
         </div>
-        <div class="field-label">
-            {{ course.title }}
-        </div>
-    </div>
 
-    <div class="card-divider my-2"></div>
-
-    <div class="flex justify-between">
-        <div class="">
-            {{ _("Total Price:") }}
-        </div>
-        <div class="field-label">
-            <!-- $ 50k -->
-            {{ frappe.utils.fmt_money(course.course_price, 2, course.currency) }}
+        <div class="flex">
+            <div class="field-label">
+                {{ _("Total Price: ") }} {{ frappe.utils.fmt_money(course.course_price, 2, course.currency) }}
+            </div>
         </div>
     </div>
 </div>
diff --git a/lms/www/billing/billing.js b/lms/www/billing/billing.js
index 51f57cef..4767fe03 100644
--- a/lms/www/billing/billing.js
+++ b/lms/www/billing/billing.js
@@ -99,7 +99,13 @@ const handle_success = (response, course, address, order_id) => {
 			order_id: order_id,
 		},
 		callback: (data) => {
-			window.location.href = data.message;
+			frappe.show_alert({
+				message: __("Payment Successful"),
+				indicator: "green",
+			});
+			setTimeout(() => {
+				window.location.href = data.message;
+			}, 2000);
 		},
 	});
 };
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index 450cf640..3f3bedbe 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -122,6 +122,10 @@
 
             {{ Notes(course) }}
 
+            <div class="vertically-center mb-3 bold-heading">
+                {{ format_amount(course.course_price, course.currency)  }}
+            </div>
+
             <div class="vertically-center mb-3">
                 <svg class="icon icon-md mr-1">
                     <use class="" href="#icon-users">
@@ -194,18 +198,18 @@
     membership.current_lesson else "1.1" if first_lesson_exists(course.name) else None %}
 
     <div class="all-cta">
-        {% if is_instructor(course.name) and not course.published and course.status != "Under Review" %}
+        {% if is_instructor and not course.published and course.status != "Under Review" %}
         <div class="btn btn-primary wide-button" id="submit-for-review" data-course="{{ course.name | urlencode }}">
             {{ _("Submit for Review") }}
         </div>
 
-        {% elif is_instructor(course.name) and lesson_index %}
+        {% elif is_instructor and lesson_index %}
         <a class="btn btn-primary wide-button" id="continue-learning"
             href="{{ get_lesson_url(course.name, lesson_index) }}{{ course.query_parameter }}">
             {{ _("Checkout Course") }}
         </a>
 
-        {% elif course.upcoming and not is_user_interested and not is_instructor(course.name) %}
+        {% elif course.upcoming and not is_user_interested and not is_instructor %}
         <div class="btn btn-secondary wide-button notify-me" data-course="{{course.name | urlencode}}">
             {{ _("Notify me when available") }}
         </div>
@@ -221,7 +225,7 @@
             {{ _("Continue Learning") }}
         </a>
 
-        {% elif course.paid_course %}
+        {% elif course.paid_course and not is_instructor %}
         <a class="btn btn-primary wide-button" href="/billing/{{ course.name | urlencode }}">
             {{ _("Buy This Course") }}
         </a>
@@ -247,7 +251,7 @@
             {% endif %}
         {% endif %}
 
-        {% if is_instructor(course.name) or has_course_moderator_role() %}
+        {% if is_instructor or has_course_moderator_role() %}
             <a class="btn btn-secondary wide-button mt-2" title="Edit Course" href="/courses/{{ course.name }}/edit">
                 <!-- <svg class="icon icon-md">
                     <use href="#icon-edit"></use>
@@ -266,7 +270,7 @@
         {{ _("You have opted to be notified for this course. You will receive an email when the course becomes available.") }}
     </div>
 
-    {% if course.status == "Under Review" and is_instructor(course.name) %}
+    {% if course.status == "Under Review" and is_instructor %}
     <div class="mb-4">
         {{ _("This course is currently under review. Once the review is complete, the System Admins will publish it on the website.") }}
     </div>
diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py
index b8e3f5ac..6ed9ab4b 100644
--- a/lms/www/courses/course.py
+++ b/lms/www/courses/course.py
@@ -88,6 +88,7 @@ def set_course_context(context, course_name):
 		"?batch=" + membership.batch if membership and membership.batch else ""
 	)
 	context.membership = membership
+	context.is_instructor = is_instructor(course.name)
 	context.certificate = is_certified(course.name)
 	eval_details = get_evaluation_details(course.name)
 	context.eligible_for_evaluation = eval_details.eligible
diff --git a/lms/www/courses/create.html b/lms/www/courses/create.html
index 8abc4353..8109085b 100644
--- a/lms/www/courses/create.html
+++ b/lms/www/courses/create.html
@@ -157,6 +157,43 @@
         <img {% if course.image %} class="image-preview" src="{{ course.image }}" {% endif %}>
     </div>
 
+    <div class="field-group">
+        <label for="paid_course" class="vertically-center mb-0">
+            <input type="checkbox" id="paid-course" {% if course.paid_course %} checked {% endif %}>
+            {{ _("Paid Course") }}
+        </label>
+    </div>
+
+    <div class="field-group price-field {% if not course.paid_course %} hide {% endif %}">
+        <div class="field-label {% if course.paid_course %} reqd {% endif %}">
+            {{ _("Course Price") }}
+        </div>
+        <div class="field-description">
+            {{ _("The price of this course.") }}
+        </div>
+        <div class="">
+            <input id="course-price" type="number" class="field-input" {% if course.course_price %} value="{{ course.course_price }}" {% endif %}>
+        </div>
+    </div>
+
+     <div class="field-group price-field {% if not course.paid_course %} hide {% endif %}">
+        <div class="field-label {% if course.paid_course %} reqd {% endif %}">
+            {{ _("Currency") }}
+        </div>
+        <div class="field-description">
+            {{ _("The currency in which users will pay for this course.") }}
+        </div>
+
+        <select class="field-input" id="currency">
+            <option></option>
+            {% for currency in currencies %}
+            <option value="{{ currency }}" {% if currency == course.currency %} selected {% endif %}>
+                {{ currency}}
+            </option>
+            {% endfor %}
+        </select>
+    </div>
+
     <div class="field-group">
         <div class="field-label">
             {{ _("Instructor") }}
diff --git a/lms/www/courses/create.js b/lms/www/courses/create.js
index 76dc1809..fcbb2e27 100644
--- a/lms/www/courses/create.js
+++ b/lms/www/courses/create.js
@@ -41,6 +41,10 @@ frappe.ready(() => {
 	$(".btn-upload").click((e) => {
 		upload_file(e);
 	});
+
+	$("#paid-course").click((e) => {
+		setup_paid_course(e);
+	});
 });
 
 const create_tag = (e) => {
@@ -79,6 +83,9 @@ const save_course = (e) => {
 				: "",
 			published: $("#published").prop("checked") ? 1 : 0,
 			upcoming: $("#upcoming").prop("checked") ? 1 : 0,
+			paid_course: $("#paid-course").prop("checked") ? 1 : 0,
+			course_price: $("#course-price").val(),
+			currency: $("#currency").val(),
 		},
 		callback: (data) => {
 			frappe.show_alert({
@@ -167,3 +174,13 @@ const upload_file = (e) => {
 		},
 	});
 };
+
+const setup_paid_course = (e) => {
+	if ($(e.target).prop("checked")) {
+		$(".price-field").removeClass("hide");
+		$(".price-field").find(".field-label").addClass("reqd");
+	} else {
+		$(".price-field").addClass("hide");
+		$(".price-field").find(".field-label").removeClass("reqd");
+	}
+};
diff --git a/lms/www/courses/create.py b/lms/www/courses/create.py
index 569dea3c..901ce1f2 100644
--- a/lms/www/courses/create.py
+++ b/lms/www/courses/create.py
@@ -35,6 +35,7 @@ def get_context(context):
 	context.member = frappe.db.get_value(
 		"User", frappe.session.user, ["full_name", "username"], as_dict=True
 	)
+	context.currencies = frappe.get_all("Currency", {"enabled": 1}, pluck="currency_name")
 
 
 def set_course_context(context, course_name):
@@ -51,8 +52,8 @@ def set_course_context(context, course_name):
 		"video_link",
 		"enable_certification",
 		"grant_certificate_after",
-		"paid_certificate",
-		"price_certificate",
+		"paid_course",
+		"course_price",
 		"currency",
 		"max_attempts",
 	]