diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index a69010d9..69633fdb 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -661,7 +661,7 @@ input[type=checkbox] {
   font-size: var(--text-sm);
   display: flex;
   flex-direction: column;
-  margin-bottom: 3rem;
+  margin-bottom: 2.5rem;
   padding-left: 200px;
   padding-right: 1rem;
   box-shadow: var(--shadow-sm);
@@ -764,7 +764,7 @@ input[type=checkbox] {
 }
 
 .education-details {
-  margin-top: 3rem;
+  margin-top: 1.25rem;
 }
 
 .bold-title {
@@ -1661,3 +1661,9 @@ li {
 .help-article {
     font-size: var(--text-base);
 }
+
+.quiz-row {
+    position: relative;
+    color: var(--text-color);
+    cursor: pointer;
+}
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index c3fb460a..12051a81 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -223,7 +223,7 @@
 <!-- Help Article -->
 {% macro HelpArticle() %}
 <div class="help-article">
-    <h3> {{ _("Help Article") }} </h3>
+    <h3> {{ _("Embed Components") }} </h3>
     <p>
         {{ _("You can add additional content to the lesson using a special syntax. The table below mentions
             all types of dynamic content that you can add to the lessons and the syntax for the same.") }}
@@ -239,11 +239,11 @@
                 {{ _("YouTube Video") }}
             </td>
             <td>
-                {% raw %} {{ YouTubeVideo("embed_src") }} {% endraw %}
+                {% raw %} {{ YouTubeVideo('Video ID') }} {% endraw %}
             </td>
             <td>
                 <span>
-                    {{ _("Copy and paste the syntax in the editor. Replace 'embed_src' with the embed source
+                    {{ _("Copy and paste the syntax in the editor. Replace 'Video ID' with the embed source
                         that YouTube provides. To get the source, follow the steps mentioned below.") }}
                 </span>
                 <ul class="p-4">
@@ -265,11 +265,12 @@
                 {{ _("Quiz") }}
             </td>
             <td>
-                {% raw %} {{ Quiz("lms_quiz_id") }} {% endraw %}
+                {% raw %} {{ Quiz('Quiz ID') }} {% endraw %}
             </td>
             <td>
                 {% set quiz_link = "<a href='/quizzes'> Quiz List </a>" %}
-                {{ _("Copy and paste the syntax in the editor. Replace 'lms_quiz_id' with the ID of the Quiz. You can get the ID of the quiz from the {0}.").format(quiz_link) }}
+                {{ _("Copy and paste the syntax in the editor. Replace 'Quiz ID' with the Id of the Quiz.
+                You can get the Id of the quiz from the {0}.").format(quiz_link) }}
             </td>
         </tr>
     </table>
@@ -279,8 +280,10 @@
 
 <!-- Discussions Component -->
 {% macro Discussions() %}
-{% set topics_count = frappe.db.count("Discussion Topic",
-    {"reference_doctype": "Course Lesson", "reference_docname": lesson.name}) %}
+{% set topics_count = frappe.db.count("Discussion Topic", {
+    "reference_doctype": "Course Lesson",
+    "reference_docname": lesson.name
+}) %}
 {% set is_instructor = frappe.session.user == course.instructor %}
 {% set condition = is_instructor if is_instructor else membership %}
 {% set doctype, docname = _("Course Lesson"), lesson.name %}
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index 2468b741..0fe52cd6 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -66,7 +66,7 @@ frappe.ready(() => {
 
     $(".btn-back").click((e) => {
         window.location.href = window.location.href.split("?")[0];
-    })
+    });
 
     $(document).on("click", ".copy-link", (e) => {
         frappe.utils.copy_to_clipboard($(e.currentTarget).data("link"));
@@ -540,6 +540,11 @@ const build_attachment_table = (file_doc) => {
 
 
 const make_editor = () => {
+    let comment =  `<!--
+    {{ YouTubeVideo('Video Id') }}
+    {{ Quiz('Quiz Id') }}
+-->`
+
     this.code_field_group = new frappe.ui.FieldGroup({
         fields: [
             {
@@ -549,7 +554,7 @@ const make_editor = () => {
                 wrap: true,
                 max_lines: Infinity,
                 min_lines: 20,
-                default: $("#body").data("body"),
+                default: $("#body").data("body") || comment,
                 depends_on: 'eval:doc.type=="Markdown"',
             }
         ],
diff --git a/lms/www/batch/quiz.html b/lms/www/batch/quiz.html
index 97f8a435..28a66e4c 100644
--- a/lms/www/batch/quiz.html
+++ b/lms/www/batch/quiz.html
@@ -52,7 +52,7 @@
             <div class="d-flex justify-content-between option-{{ num }}">
                 <div contenteditable="true" data-placeholder="{{ _('Option') }}"
                     class="option-input">{% if option %}{{ option }}{% endif %}</div>
-                <div contenteditable="true" data-placeholder="{{ _('Explanation') }}"
+                <div contenteditable="true" data-placeholder="{{ _('Explain the option') }}"
                     class="option-input">{% if explanation %}{{ explanation }}{% endif %}</div>
                 <div class="option-checkbox">
                     <input type="checkbox" {% if question['is_correct_' + num] %} checked {% endif %}>
@@ -68,8 +68,17 @@
 
     <div class="mt-4">
         <button class="btn btn-secondary btn-sm btn-question"> {{ _("New Question") }} </button>
-        <button class="btn btn-primary btn-sm btn-save-question ml-2
-            {% if not quiz.name %} hide {% endif %}"> {{ _("Save Quiz") }} </button>
+
+        {% if quiz.name %}
+        <button class="btn btn-secondary btn-sm copy-quiz-id ml-2" data-name="'{{ quiz.name }}'">
+            {{ _("Copy Quiz ID") }}
+        </button>
+        {% endif %}
+
+        <button class="btn btn-primary btn-sm btn-save-question ml-2 {% if not quiz.name %} hide {% endif %}">
+            {{ _("Save Quiz") }}
+        </button>
+
     </div>
 </div>
 {% endmacro %}
diff --git a/lms/www/batch/quiz.js b/lms/www/batch/quiz.js
index 10c6698f..a7491fed 100644
--- a/lms/www/batch/quiz.js
+++ b/lms/www/batch/quiz.js
@@ -8,7 +8,11 @@ frappe.ready(() => {
         save_question(e);
     });
 
-    get_questions()
+    $(".copy-quiz-id").click((e) => {
+        frappe.utils.copy_to_clipboard($(e.currentTarget).data("name"));
+    });
+
+    get_questions();
 
 });
 
@@ -54,6 +58,7 @@ const save_question = (e) => {
     if (!$("#quiz-title").text()) {
         frappe.throw(__("Quiz Title is mandatory."));
     }
+
     frappe.call({
         method: "lms.lms.doctype.lms_quiz.lms_quiz.save_quiz",
         args: {
diff --git a/lms/www/batch/quiz_list.html b/lms/www/batch/quiz_list.html
index 41891b1d..8a34f17b 100644
--- a/lms/www/batch/quiz_list.html
+++ b/lms/www/batch/quiz_list.html
@@ -15,34 +15,46 @@
         {% if quiz_list | length %}
         <a class="btn btn-secondary btn-sm pull-right" href="/quizzes/new-quiz"> {{ _("Add Quiz") }} </a>
         <div class="course-home-headings"> {{ _("Quiz List") }} </div>
+
         <div class="common-card-style">
             <table class="table">
+
                 <tr style="background-color: var(--fg-hover-color); font-weight: bold">
                     <td style="width: 10%;"> {{ _("No.") }} </td>
                     <td style="width: 45%;"> {{ _("Title") }} </td>
                     <td> {{ _("ID") }} </td>
+                    <td>  </td>
                 </tr>
+
                 {% for quiz in quiz_list %}
-                <tr style="position: relative; color: var(--text-color);">
+                <tr class="quiz-row" data-name="{{ quiz.name }}">
                     <td> {{ loop.index }} </td>
                     <td>
-                        <a class="button-links" href="/quizzes/{{ quiz.name }}">{{ quiz.title }}</a>
+                        {{ quiz.title }}
                     </td>
                     <td>
-                        <a class="button-links" href="/quizzes/{{ quiz.name }}">{{ quiz.name }}</a>
+                        {{ quiz.name }}
+                    </td>
+                    <td>
+                        <a class="btn btn-secondary btn-sm copy-quiz-id" data-name="'{{ quiz.name }}'">
+                            {{ _("Copy Quiz ID") }}
+                        </a>
                     </td>
                 </tr>
                 {% endfor %}
+
             </table>
         </div>
+
         {% else %}
         <div class="empty-state">
             <div class="empty-state-text">
                 <div class="empty-state-heading">{{ _("You have not created any quiz yet.") }}</div>
                 <div class="course-meta mb-6">{{ _("Create a quiz and add it to your course to engage users.") }}</div>
                 <a class="btn btn-secondary btn-sm"
-                href="{% if frappe.session.user == 'Guest' %} /login?redirect-to=/quizzes {% else %} /quizzes/new-quiz  {% endif %}">
-                {{ _("Add Quiz") }} </a>
+                    href="{% if frappe.session.user == 'Guest' %} /login?redirect-to=/quizzes {% else %} /quizzes/new-quiz  {% endif %}">
+                    {{ _("Add Quiz") }}
+                </a>
             </div>
         </div>
         {% endif %}
@@ -50,3 +62,22 @@
 </div>
 {% endblock %}
 
+
+{% block script %}
+<script>
+    frappe.ready(() => {
+
+        $(".copy-quiz-id").click((e) => {
+            e.preventDefault();
+            frappe.utils.copy_to_clipboard($(e.currentTarget).data("name"));
+        });
+
+        $(".quiz-row").click((e) => {
+            if (!$(e.target).hasClass("copy-quiz-id")) {
+                window.location.href = `/quizzes/${$(e.currentTarget).data('name')}`;
+            }
+        });
+
+    });
+</script>
+{% endblock %}
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index c7a18944..d049ad31 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -114,7 +114,9 @@
         </div>
 
         <div class="course-image-attachment {% if not course.image %} hide {% endif %} ">
-            <a href="{{ course.image }}" id="image" target="_blank"> {{ course.image }} </a>
+            <a {% if course.image %} href="{{ course.image }}" {% endif %} id="image" target="_blank">
+                {{ course.image }}
+            </a>
             <button class="btn btn-sm btn-default btn-clear ml-4"> {{ _("Clear") }} </button>
         </div>
         <a class="btn btn-default btn-sm btn-attach mt-1 {% if course.image %} hide {% endif %}"> {{ _("Attach Image") }} </a>
diff --git a/lms/www/courses/course.js b/lms/www/courses/course.js
index 8281669d..9e9f086b 100644
--- a/lms/www/courses/course.js
+++ b/lms/www/courses/course.js
@@ -329,6 +329,7 @@ const add_tag = (e) => {
 const save_course = (e) => {
     let tags = $('.course-card-pills').map((i, el) => $(el).text().trim()).get();
     tags = tags.filter(word => word.trim().length > 0);
+
     frappe.call({
         method: "lms.lms.doctype.lms_course.lms_course.save_course",
         args: {
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index a24a2977..083cb524 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -12,8 +12,8 @@
     <div class="container">
 
         {% if show_creators_section %}
-        <a class="btn btn-secondary btn-md pull-right" id="create-course-link" href="/courses/new-course">
-            {{ _("Create a Course")}}
+        <a class="btn btn-secondary btn-sm pull-right" id="create-course-link" href="/courses/new-course">
+            {{ _("Create a Course") }}
         </a>
         {% endif %}
 
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 7038e7c8..bbf242c7 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -3,342 +3,404 @@
 <meta name="description" content="{{ member.full_name }}" />
 {% endblock %}
 
+
 {% block content %}
 <div class="common-page-style profile-page">
-  {{ ProfileBanner(member) }}
-  <div class="profile-page-body">
-    <div class="container">
-      {% set read_only = member.name != frappe.session.user %}
-      {{ About(member) }}
-      {{ EducationDetails(member) }}
-      {{ WorkDetails(member) }}
-      {{ Certification(member) }}
-      {{ Contact(member) }}
-      {{ Skills(member) }}
-      {{ CareerPreference(member) }}
+    {{ ProfileBanner(member) }}
+
+    <div class="profile-page-body">
+        <div class="container">
+        {% set read_only = member.name != frappe.session.user %}
+        {{ About(member) }}
+        {{ EducationDetails(member) }}
+        {{ WorkDetails(member) }}
+        {{ Certification(member) }}
+        {{ Contact(member) }}
+        {{ Skills(member) }}
+        {{ CareerPreference(member) }}
+        </div>
+    </div>
+
+    <div class="container">
+        {{ CoursesCreated(member, read_only) }}
+        {{ CoursesMentored(member, read_only) }}
+        {{ ProfileTabs(profile_tabs) }}
     </div>
-  </div>
-  <div class="container">
-    {{ CoursesCreated(member, read_only) }}
-    {{ CoursesMentored(member, read_only) }}
-    {{ ProfileTabs(profile_tabs) }}
-  </div>
 </div>
 {% endblock %}
 
+
+<!-- Banner -->
 {% macro ProfileBanner(member) %}
 {% set cover_image = member.cover_image if member.cover_image else "/assets/lms/images/profile-banner.png" %}
 {% set enrollment = get_course_membership(frappe.session.user, member_type="Student") | length %}
 {% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}
+
 <div class="container">
-  <div class="profile-banner" style="background-image: url({{ cover_image }})">
-    <div class="profile-avatar">
-      {{ widgets.Avatar(member=member, avatar_class="avatar-square") }}
-    </div>
-  </div>
-  <div class="profile-info">
-    <div class="profile-name-section">
-      <div class="profile-name"> {{ member.full_name }} </div>
-
-      {% if get_authored_courses(member.name) | length %}
-      <div class="creator-badge"> {{ _("Creator") }} </div>
-      {% endif %}
-
-      {% if member.looking_for_job %}
-      <div class="creator-badge"> {{ _("Open Network") }} </div>
-      {% endif %}
-
-      {% if frappe.session.user == member.email %}
-      <a class="button is-secondary ml-auto mt-1" href="/edit-profile?name={{ member.email }}"> {{ _("Edit Profile") }} </a>
-      {% endif %}
+    <div class="profile-banner" style="background-image: url({{ cover_image }})">
+        <div class="profile-avatar">
+            {{ widgets.Avatar(member=member, avatar_class="avatar-square") }}
+        </div>
     </div>
 
-    <div class="profile-meta">
-      {% if member.headline %}
-      <div class="course-meta mr-3"> {{ member.headline }} </div>
-      {% endif %}
+    <div class="profile-info">
+        <div class="profile-name-section">
+            <div class="profile-name"> {{ member.full_name }} </div>
 
-      {% if enrollment %}
-      <div class="course-meta">
-        <img src="/assets/lms/icons/book_plain.svg">
-        {{ enrollment }} {{ enrollment_suffix }} {{ _("taken") }} </div>
-      {% endif %}
+            {% if get_authored_courses(member.name) | length %}
+            <div class="creator-badge"> {{ _("Creator") }} </div>
+            {% endif %}
+
+            {% if member.looking_for_job %}
+            <div class="creator-badge"> {{ _("Open Network") }} </div>
+            {% endif %}
+
+            {% if frappe.session.user == member.email %}
+            <div class="ml-auto mt-1">
+                <a class="btn btn-secondary btn-sm" href="/dashboard"> {{ _("Visit Dashboard") }} </a>
+                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile?name={{ member.email }}"> {{ _("Edit Profile") }} </a>
+            </div>
+            {% endif %}
+        </div>
+
+        <div class="profile-meta">
+            {% if member.headline %}
+            <div class="course-meta mr-3"> {{ member.headline }} </div>
+            {% endif %}
+
+            {% if enrollment %}
+            <div class="course-meta">
+                <img src="/assets/lms/icons/book_plain.svg">
+                {{ enrollment }} {{ enrollment_suffix }} {{ _("taken") }}
+            </div>
+            {% endif %}
+        </div>
     </div>
-
-  </div>
 </div>
 {% endmacro %}
 
+
+<!-- Courses Created -->
 {% macro CoursesCreated(member, read_only) %}
 {% set authored_courses = get_authored_courses(member.name) %}
+
 {% if authored_courses | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses Created") }} </div>
-  <div class="cards-parent">
-    {% for course in authored_courses %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses Created") }} </div>
+    <div class="cards-parent">
+        {% for course in authored_courses %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Courses Mentored -->
 {% macro CoursesMentored(member, read_only) %}
 {% if member.get_mentored_courses() | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses Mentored") }} </div>
-  <div class="cards-parent">
-    {% for course in member.get_mentored_courses() %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses Mentored") }} </div>
+    <div class="cards-parent">
+        {% for course in member.get_mentored_courses() %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Courses Enrolled -->
 {% macro CoursesEnrolled(member, read_only) %}
 {% set enrolled = get_enrolled_courses() %}
 
 {% if enrolled.completed | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses Completed") }} </div>
-  <div class="cards-parent">
-    {% for course in enrolled.completed %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses Completed") }} </div>
+    <div class="cards-parent">
+        {% for course in enrolled.completed %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
 
 {% if enrolled.in_progress | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses In Progress") }} </div>
-  <div class="cards-parent">
-    {% for course in enrolled.in_progress %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses In Progress") }} </div>
+    <div class="cards-parent">
+        {% for course in enrolled.in_progress %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
-
 {% endmacro %}
 
+
+<!-- Profile Tabs Extension -->
 {% macro ProfileTabs(profile_tabs) %}
 <div>
-  {% for tab in profile_tabs %}
-  {% set slug = title.lower().replace(" ", "-") %}
-  <div class="tab-content">
-    <div class="tab-pane fade py-4 show active" role="tabpanel" id="slug">
-      {{ tab.render() }}
+    {% for tab in profile_tabs %}
+    {% set slug = title.lower().replace(" ", "-") %}
+    <div class="tab-content">
+        <div class="tab-pane fade py-4 show active" role="tabpanel" id="slug">
+        {{ tab.render() }}
+        </div>
     </div>
-  </div>
-  {% endfor %}
+    {% endfor %}
 </div>
 {% endmacro %}
 
+
+<!-- About Section -->
 {% macro About(member) %}
 {% if member.bio %}
-  <div class="">
-    <div class="common-card-style profile-card">
-      <div class="course-home-headings"> {{ _("About") }} </div>
-      <div class="description">{{ member.bio }}</div>
+    <div class="">
+        <div class="common-card-style profile-card">
+            <div class="course-home-headings"> {{ _("About") }} </div>
+            <div class="description">{{ member.bio }}</div>
+        </div>
     </div>
-  </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Work Preference -->
 {% macro WorkPreference(member) %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Work Preference") }} </div>
-    <div> {{ member.attire }} </div>
-    <div> {{ member.collaboration }} </div>
-    <div> {{ member.role }} </div>
-    <div> {{ member.location_preference }} </div>
-    <div> {{ member.time }} </div>
-    <div> {{ member.company_type }} </div>
-  </div>
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Work Preference") }} </div>
+        <div> {{ member.attire }} </div>
+        <div> {{ member.collaboration }} </div>
+        <div> {{ member.role }} </div>
+        <div> {{ member.location_preference }} </div>
+        <div> {{ member.time }} </div>
+        <div> {{ member.company_type }} </div>
+    </div>
 </div>
 {% endmacro %}
 
+
+<!-- Career Preference -->
 {% macro CareerPreference(member) %}
 {% if member.preferred_functions or member.preferred_industries or member.preferred_location or member.dream_companies %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Career Preference") }} </div>
-    <div class="profile-column-grid">
-      {% if member.preferred_functions | length %}
-      <div>
-        <b>{{ _("Preferred Functions:") }}</b>
-        {% for function in member.preferred_functions %}
-        <div class="description">{{ function.function }}</div>
-        {% endfor %}
-      </div>
-      {% endif %}
+    <div class="common-card-style profile-card">
 
-      {% if member.preferred_industries | length %}
-      <div>
-        <b>{{ _("Preferred Industries:") }}</b>
-        {% for industry in member.preferred_industries %}
-        <div class="description">{{ industry.industry }}</div>
-        {% endfor %}
-      </div>
-      {% endif %}
+        <div class="course-home-headings"> {{ _("Career Preference") }} </div>
+        <div class="profile-column-grid">
 
-      {% if member.preferred_location %}
-      <div>
-        <b> {{ _("Preferred Locations:") }} </b>
-        <div class="description"> {{ member.preferred_location }} </div>
-      </div>
-      {% endif %}
+            {% if member.preferred_functions | length %}
+            <div>
+                <b>{{ _("Preferred Functions:") }}</b>
+                {% for function in member.preferred_functions %}
+                <div class="description">{{ function.function }}</div>
+                {% endfor %}
+            </div>
+            {% endif %}
 
-      {% if member.dream_companies %}
-      <div>
-        <b> {{ _("Dream Companies:") }} </b>
-        <div class="description"> {{ member.dream_companies }} </div>
-      </div>
-      {% endif %}
+            {% if member.preferred_industries | length %}
+            <div>
+                <b>{{ _("Preferred Industries:") }}</b>
+                {% for industry in member.preferred_industries %}
+                <div class="description">{{ industry.industry }}</div>
+                {% endfor %}
+            </div>
+            {% endif %}
+
+            {% if member.preferred_location %}
+            <div>
+                <b> {{ _("Preferred Locations:") }} </b>
+                <div class="description"> {{ member.preferred_location }} </div>
+            </div>
+            {% endif %}
+
+            {% if member.dream_companies %}
+            <div>
+                <b> {{ _("Dream Companies:") }} </b>
+                <div class="description"> {{ member.dream_companies }} </div>
+            </div>
+            {% endif %}
+
+        </div>
     </div>
-
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Contact Section -->
 {% macro Contact(member) %}
 {% if member.linkedin or member.medium or member.github %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Contact") }} </div>
-    <div class="profile-column-grid">
-      {% if member.linkedin %}
-      {% set linkedin = member.linkedin[:-1] if member.linkedin[-1] == "/" else member.linkedin %}
-      <a class="button-links description" href="{{ member.linkedin }}">
-        <img src="/assets/lms/icons/linkedin.svg"> {{ linkedin.split("/")[-1] }}
-      </a>
-    {% endif %}
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Contact") }} </div>
+        <div class="profile-column-grid">
+        {% if member.linkedin %}
+        {% set linkedin = member.linkedin[:-1] if member.linkedin[-1] == "/" else member.linkedin %}
+        <a class="button-links description" href="{{ member.linkedin }}">
+            <img src="/assets/lms/icons/linkedin.svg"> {{ linkedin.split("/")[-1] }}
+        </a>
+        {% endif %}
 
-    {% if member.medium %}
-    <a class="button-links description" href="{{ member.medium}}">
-      <img src="/assets/lms/icons/medium.svg"> {{ member.medium.split("/")[-1] }}
-    </a>
-    {% endif %}
+        {% if member.medium %}
+        <a class="button-links description" href="{{ member.medium}}">
+            <img src="/assets/lms/icons/medium.svg"> {{ member.medium.split("/")[-1] }}
+        </a>
+        {% endif %}
 
-    {% if member.github %}
-    <a class="button-links description" href="{{ member.github }}">
-      <img src="/assets/lms/icons/github.svg"> {{ member.github.split("/")[-1] }}
-    </a>
-    {% endif %}
+        {% if member.github %}
+        <a class="button-links description" href="{{ member.github }}">
+            <img src="/assets/lms/icons/github.svg"> {{ member.github.split("/")[-1] }}
+        </a>
+        {% endif %}
 
+        </div>
     </div>
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Skills -->
 {% macro Skills(member) %}
 {% if member.skill | length %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Skills")}} </div>
-    <div class="profile-column-grid">
-      {% for skill in member.skill %}
-      <div class="description"> {{ skill.skill_name }} </div>
-      {% endfor %}
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Skills")}} </div>
+        <div class="profile-column-grid">
+            {% for skill in member.skill %}
+            <div class="description"> {{ skill.skill_name }} </div>
+            {% endfor %}
+        </div>
     </div>
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Education Details -->
 {% macro EducationDetails(member) %}
 {% if member.education %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Education") }} </div>
-    <div class="profile-grid-card">
-      {% for edu in member.education %}
-      <div class="profile-card-row">
-        <div class="bold-title"> {{ edu.institution_name }} </div>
-        <div class="profile-item"> {{ edu.degree_type }} <span></span> {{ edu.major }}
-          {% if not member.hide_private %}
-          <!-- {% if edu.grade_type %} {{ edu.grade_type }}  {% endif %} -->
-          {% if edu.grade %} <span></span> {{ edu.grade }}  {% endif %}
-          {% endif %}
-        </div>
-        <div class="description">
-          {% if edu.start_date %}
-          {{ frappe.utils.format_date(edu.start_date, "MMM YYYY") }} -
-          {% endif %}
-          {{ frappe.utils.format_date(edu.end_date, "MMM YYYY") }} </div>
-        <div class="description"> {{ edu.location }} </div>
-      </div>
-      {% endfor %}
-    </div>
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Education") }} </div>
 
-  </div>
+        <div class="profile-grid-card">
+            {% for edu in member.education %}
+            <div class="profile-card-row">
+                <div class="bold-title"> {{ edu.institution_name }} </div>
+                <div class="profile-item"> {{ edu.degree_type }} <span></span> {{ edu.major }}
+                    {% if not member.hide_private %}
+                    <!-- {% if edu.grade_type %} {{ edu.grade_type }}  {% endif %} -->
+                    {% if edu.grade %} <span></span> {{ edu.grade }}  {% endif %}
+                    {% endif %}
+                </div>
+
+                <div class="description">
+                    {% if edu.start_date %}
+                    {{ frappe.utils.format_date(edu.start_date, "MMM YYYY") }} -
+                    {% endif %}
+                    {{ frappe.utils.format_date(edu.end_date, "MMM YYYY") }}
+                </div>
+                <div class="description"> {{ edu.location }} </div>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Work Details -->
 {% macro WorkDetails(member) %}
 {% set work_details = member.work_experience + member.internship %}
+
 {% if work_details | length %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-   <div class="course-home-headings"> {{ _("Work Experience") }} </div>
-   <div class="profile-grid-card">
-    {% for work in work_details %}
-    <div class="">
-      <div class="bold-title"> {{ work.title }} </div>
-      <div class="profile-item"> {{ work.company }} </div>
-      <div class="description"> {{ frappe.utils.format_date(work.from_date, "MMM YYYY") }} -
-        {% if work.to_date %} {{ frappe.utils.format_date(work.to_date, "MMM YYYY") }} {% else %} Present {% endif %} </div>
-        <div class="description"> {{ work.location }} </div>
-        {% if work.description %} <div class="profile-item"> {{ work.description }} </div> {% endif %}
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Work Experience") }} </div>
+        <div class="profile-grid-card">
+
+            {% for work in work_details %}
+            <div class="">
+                <div class="bold-title"> {{ work.title }} </div>
+                <div class="profile-item"> {{ work.company }} </div>
+                <div class="description">
+                    {{ frappe.utils.format_date(work.from_date, "MMM YYYY") }} -
+                    {% if work.to_date %} {{ frappe.utils.format_date(work.to_date, "MMM YYYY") }}
+                    {% else %} Present {% endif %}
+                </div>
+
+                <div class="description"> {{ work.location }} </div>
+
+                {% if work.description %}
+                <div class="profile-item">
+                    {{ work.description }}
+                </div>
+                {% endif %}
+            </div>
+            {% endfor %}
+
+        </div>
     </div>
-    {% endfor %}
-   </div>
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Certifications -->
 {% macro Certification(member) %}
 {% if member.certification %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Certification") }} </div>
-    <div class="profile-grid-card">
-      {% for cert in member.certification %}
-      <div class="">
-        <div class="bold-title"> {{ cert.certification_name }} </div>
-        <div class="profile-item"> {{ cert.organization }} </div>
-        <div class="description"> {{ frappe.utils.format_date(cert.issue_date, "MMM YYYY") }}
-          {% if cert.expiration_date %} - {{ frappe.utils.format_date(cert.expiration_date, "MMM YYYY") }} {% endif %} </div>
-          {% if cert.description %} <div class="profile-item"> {{ cert.description }} </div> {% endif %}
-      </div>
-      {% endfor %}
-    </div>
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Certification") }} </div>
+        <div class="profile-grid-card">
+            {% for cert in member.certification %}
+            <div class="">
 
-  </div>
+                <div class="bold-title"> {{ cert.certification_name }} </div>
+                <div class="profile-item"> {{ cert.organization }} </div>
+
+                <div class="description">
+                    {{ frappe.utils.format_date(cert.issue_date, "MMM YYYY") }}
+                    {% if cert.expiration_date %}
+                    - {{ frappe.utils.format_date(cert.expiration_date, "MMM YYYY") }}
+                    {% endif %}
+                </div>
+
+                {% if cert.description %}
+                <div class="profile-item">
+                    {{ cert.description }}
+                </div>
+                {% endif %}
+
+            </div>
+            {% endfor %}
+        </div>
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
 {% block script %}
 <script>
-  frappe.ready(() => {
-    if ("{{ member.name }}" == frappe.session.user) {
-      setTimeout(() => {
-        var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
-        link_array.length && $(link_array[0]).addClass("active");
-      }, 0)
-    }
+    frappe.ready(() => {
+        if ("{{ member.name }}" == frappe.session.user) {
+            setTimeout(() => {
+                var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
+                link_array.length && $(link_array[0]).addClass("active");
+            }, 0)
+        }
 
-    if ($(".profile-column-one").children().length == 0) {
-      $(".profile-column-one").hide();
-    }
-  });
+        if ($(".profile-column-one").children().length == 0) {
+            $(".profile-column-one").hide();
+        }
+    });
 </script>
 {% endblock %}