diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
index 7e17c865..298a2363 100644
--- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -1,5 +1,6 @@
 {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
 
+
 {% if enrolled | length %}
 <div class="cards-parent">
     {% for course in enrolled %}
@@ -7,23 +8,24 @@
     {% endfor %}
 </div>
 
+
 {% else %}
-    {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
-    <div class="empty-state">
-        <div class="empty-state-text text-left">
-            <div class="text-center">
-                <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
-                <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
-            </div>
-            {% set recommended_courses = get_popular_courses() %}
-            <div class="cards-parent">
-                {% for course in recommended_courses %}
-                    {% if course %}
-                        {% set course_details = frappe.get_doc("LMS Course", course.course) %}
-                        {{ widgets.CourseCard(course=course_details) }}
-                    {% endif %}
-                {% endfor %}
-            </div>
+{% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
+<div class="empty-state p-5">
+    <div style="text-align: left; flex: 1;">
+        <div class="text-center">
+            <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
+            <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
+        </div>
+        {% set recommended_courses = get_popular_courses() %}
+        <div class="cards-parent">
+            {% for course in recommended_courses %}
+                {% if course %}
+                    {% set course_details = frappe.get_doc("LMS Course", course.course) %}
+                    {{ widgets.CourseCard(course=course_details) }}
+                {% endif %}
+            {% endfor %}
         </div>
     </div>
+</div>
 {% endif %}
diff --git a/lms/lms/widgets/Reviews.html b/lms/lms/widgets/Reviews.html
index 29015da1..89904e55 100644
--- a/lms/lms/widgets/Reviews.html
+++ b/lms/lms/widgets/Reviews.html
@@ -1,166 +1,169 @@
 {% if not course.upcoming %}
 <div class="reviews-parent">
-  {% set reviews = get_reviews(course.name) %}
-  <div class="mb-5">
-    <span class="course-home-headings"> {{ _("Reviews") }} </span>
-    {% if is_eligible_to_review(course.name, membership) and reviews | length %}
-    <span class="btn btn-secondary btn-sm review-link">
-      {{ _("Write a review") }}
-    </span>
-    {% endif %}
-  </div>
-
-  {% set avg_rating = get_average_rating(course.name) %}
-  {% if avg_rating %}
-  <div class="reviews-header">
-    <div class="text-center">
-      <div class="avg-rating"> {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} </div>
-      <div class="course-meta"> {{ reviews | length }} {{ _("ratings") }} </div>
-      <div class="avg-rating-stars">
-        <div class="rating">
-          {% for i in [1, 2, 3, 4, 5] %}
-          <svg class="icon icon-md {% if i <= frappe.utils.ceil(avg_rating) %} star-click {% endif %}" data-rating="{{ i }}">
-            <use href="#icon-star"></use>
-          </svg>
-          {% endfor %}
-        </div>
-      </div>
-        <div class="course-meta">
-            {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} {{ _("out of 5 ") }}
-        </div>
-    </div>
-    <div class="vertical-divider"></div>
-    {% set sorted_reviews = get_sorted_reviews(course.name) %}
-    <div>
-      {% for review in sorted_reviews %}
-      <div class="d-flex align-items-center mb-3">
-        <div class="course-meta mr-2"> {{ frappe.utils.cint(review) }} {{ _("stars") }} </div>
-        <div class="progress">
-          <div class="progress-bar" role="progressbar" aria-valuenow="{{ sorted_reviews[review] }}"
-          aria-valuemin="0" aria-valuemax="100" style="width:{{ sorted_reviews[review] }}%">
-            <span class="sr-only"> {{ sorted_reviews[review] }} Complete</span>
-          </div>
-        </div>
-        <div class="course-meta ml-3"> {{ frappe.utils.cint(sorted_reviews[review]) }}% </div>
-      </div>
-      {% endfor %}
-    </div>
-  </div>
-  {% endif %}
-
-  {% if reviews | length %}
-  <div class="mt-12">
-    {% for review in reviews %}
-    <div class="mb-4">
-      <div class="d-flex align-items-center">
-
-        <div class="mr-4">
-          {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }}
-        </div>
-
-        <div>
-          <div class="d-flex align-items-center">
-            <a class="button-links mr-4" href="{{get_profile_url(review.owner_details.username) }}">
-              <span class="bold-heading">
-                {{ review.owner_details.full_name }}
-              </span>
-            </a>
-          <div class="frappe-timestamp course-meta" data-timestamp="{{ review.creation }}"> frappe.utils.pretty_date(review.creation) </div>
-          </div>
-
-          <div class="rating">
-            {% for i in [1, 2, 3, 4, 5] %}
-            <svg class="icon icon-md {% if i <= review.rating %} star-click {% endif %}" data-rating="{{ i }}">
-              <use href="#icon-star"></use>
-            </svg>
-            {% endfor %}
-          </div>
-        </div>
-      </div>
-
-      <div class="review-content"> {{ review.review }} </div>
-    </div>
-    {% if loop.index != reviews | length %}
-    <div class="card-divider"></div>
-    {% endif %}
-    {% endfor %}
-  </div>
-
-  {% else %}
-  <div class="empty-state">
-    <div>
-      <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-    </div>
-    <div class="empty-state-text">
-      <div class="empty-state-heading">{{ _("Review the course") }}</div>
-      <div class="course-meta">{{ _("Help us improve our course material.") }}</div>
-    </div>
-    <div>
-      {% if not is_instructor(course.name) %}
+    {% set reviews = get_reviews(course.name) %}
+    <div class="mb-5">
+        <span class="course-home-headings"> {{ _("Reviews") }} </span>
         {% if is_eligible_to_review(course.name, membership) %}
-        <span class="review-link button is-secondary">
-          {{ _("Write a review") }}
-        </span>
-        {% elif frappe.session.user == "Guest" %}
-        <a class="button is-primary" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
-        {% elif not membership %}
-        <div class="button is-primary join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
+            <span class="btn btn-secondary btn-sm review-link">
+                {{ _("Write a review") }}
+            </span>
+        {% elif not is_instructor(course.name) and frappe.session.user == "Guest" %}
+            <a class="btn btn-secondary btn-s pull-rightm" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
+        {% elif not is_instructor(course.name) and not membership %}
+            <div class="btn btn-secondary btn-sm join-batch pull-right" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
         {% endif %}
-      {% endif %}
     </div>
-  </div>
-  {% endif %}
+
+
+    {% set avg_rating = get_average_rating(course.name) %}
+    {% if avg_rating %}
+    <div class="reviews-header">
+        <div class="text-center">
+            <div class="avg-rating">
+                {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }}
+            </div>
+            <div class="course-meta"> {{ reviews | length }} {{ _("ratings") }} </div>
+            <div class="avg-rating-stars">
+                <div class="rating">
+                    {% for i in [1, 2, 3, 4, 5] %}
+                    <svg class="icon icon-md {% if i <= frappe.utils.ceil(avg_rating) %} star-click {% endif %}" data-rating="{{ i }}">
+                        <use href="#icon-star"></use>
+                    </svg>
+                    {% endfor %}
+                </div>
+            </div>
+            <div class="course-meta">
+                {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} {{ _("out of 5 ") }}
+            </div>
+        </div>
+
+
+        <div class="vertical-divider"></div>
+        {% set sorted_reviews = get_sorted_reviews(course.name) %}
+        <div>
+            {% for review in sorted_reviews %}
+            <div class="d-flex align-items-center mb-3">
+                <div class="course-meta mr-2">
+                    {{ frappe.utils.cint(review) }} {{ _("stars") }}
+                </div>
+                <div class="progress">
+                    <div class="progress-bar" role="progressbar" aria-valuenow="{{ sorted_reviews[review] }}"
+                        aria-valuemin="0" aria-valuemax="100" style="width:{{ sorted_reviews[review] }}%">
+                        <span class="sr-only"> {{ sorted_reviews[review] }} Complete</span>
+                    </div>
+                </div>
+                <div class="course-meta ml-3"> {{ frappe.utils.cint(sorted_reviews[review]) }}% </div>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+    {% endif %}
+
+
+    {% if reviews | length %}
+    <div class="mt-12">
+        {% for review in reviews %}
+        <div class="mb-4">
+            <div class="d-flex align-items-center">
+                <div class="mr-4">
+                {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }}
+                </div>
+                <div>
+                    <div class="d-flex align-items-center">
+                        <a class="button-links mr-4" href="{{get_profile_url(review.owner_details.username) }}">
+                        <span class="bold-heading">
+                            {{ review.owner_details.full_name }}
+                        </span>
+                        </a>
+                        <div class="frappe-timestamp course-meta" data-timestamp="{{ review.creation }}">
+                            {{ frappe.utils.pretty_date(review.creation) }}
+                        </div>
+                    </div>
+                    <div class="rating">
+                        {% for i in [1, 2, 3, 4, 5] %}
+                            <svg class="icon icon-md {% if i <= review.rating %} star-click {% endif %}" data-rating="{{ i }}">
+                                <use href="#icon-star"></use>
+                            </svg>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+            <div class="review-content"> {{ review.review }} </div>
+        </div>
+        {% if loop.index != reviews | length %}
+            <div class="card-divider"></div>
+        {% endif %}
+        {% endfor %}
+    </div>
+
+
+    {% else %}
+    <div class="empty-state">
+        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
+        <div class="empty-state-text">
+            <div class="empty-state-heading">{{ _("Review the course") }}</div>
+            <div class="course-meta">{{ _("Help us improve our course material.") }}</div>
+        </div>
+    </div>
+    {% endif %}
 </div>
 
-<div class="modal fade review-modal" id="review-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-  aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <div class="font-weight-bold">{{ _("Write a review") }}</div>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <form class="review-form" id="review-form">
-          <div class="form-group">
-            <div class="clearfix">
-              <label class="control-label reqd" style="padding-right: 0px;">{{ _("Rating") }}</label>
-            </div>
-            <div class="control-input-wrapper">
-              <div class="control-input">
-                <div class="rating rating-field" id="rating">
-                  {% for i in [1, 2, 3, 4, 5] %}
-                  <svg class="icon icon-md icon-rating" data-rating="{{ i }}">
-                    <use href="#icon-star"></use>
-                  </svg>
-                  {% endfor %}
-                </div>
-              </div>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <div class="clearfix">
-              <label class="control-label reqd" style="padding-right: 0px;">{{ _("Review") }}</label>
+<div class="modal fade review-modal" id="review-modal" tabindex="-1" role="dialog"
+    aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="font-weight-bold">{{ _("Write a review") }}</div>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </div>
-            <div class="control-input-wrapper">
-              <div class="control-input">
-                <textarea type="text" autocomplete="off" class="input-with-feedback form-control review-field"
-                  data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="" style="height: 300px;"
-                  spellcheck="false"></textarea>
-              </div>
+
+
+            <div class="modal-body">
+                <form class="review-form" id="review-form">
+                    <div class="form-group">
+                        <div class="clearfix">
+                            <label class="control-label reqd" style="padding-right: 0px;">{{ _("Rating") }}</label>
+                        </div>
+                        <div class="control-input-wrapper">
+                            <div class="control-input">
+                                <div class="rating rating-field" id="rating">
+                                    {% for i in [1, 2, 3, 4, 5] %}
+                                    <svg class="icon icon-md icon-rating" data-rating="{{ i }}">
+                                        <use href="#icon-star"></use>
+                                    </svg>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="form-group">
+                        <div class="clearfix">
+                            <label class="control-label reqd" style="padding-right: 0px;">{{ _("Review") }}</label>
+                        </div>
+                        <div class="control-input-wrapper">
+                            <div class="control-input">
+                                <textarea type="text" autocomplete="off" class="input-with-feedback form-control review-field"
+                                data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="" style="height: 300px;"
+                                spellcheck="false"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                    <p class="error-field muted-text"></p>
+                </form>
             </div>
-          </div>
-          <p class="error-field muted-text"></p>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <div class="button submit-review is-primary" data-course="{{ course.name | urlencode}}" id="submit-review">
-          {{ _("Submit") }}</div>
-      </div>
+
+
+            <div class="modal-footer">
+                <div class="button submit-review is-primary" data-course="{{ course.name | urlencode}}" id="submit-review">
+                    {{ _("Submit") }}
+                </div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 {% endif %}
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 6d43a2bd..272acabb 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -902,15 +902,14 @@ pre {
 .empty-state {
   background: var(--gray-200);
   border-radius: var(--border-radius-lg);
-  padding: 1.25rem;
+  padding: 4rem;
   display: flex;
-  justify-content: space-between;
+  justify-content: center;
   align-items: center;
 }
 
 .empty-state-text {
-    flex: 1;
-    text-align: center;
+    margin-left: 1rem;
 }
 
 .empty-state-heading {
@@ -1691,3 +1690,8 @@ li {
     margin-bottom: 0;
     cursor: pointer;
 }
+
+.icon-xl {
+    width: 2.75rem;
+    height: 2.75rem;
+}
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index b70db8a8..f58db0b0 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -9,9 +9,7 @@
 
 {% else %}
 <div class="empty-state">
-    <div>
-        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-    </div>
+    <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
     <div class="empty-state-text">
         <div class="empty-state-heading">{{ _("No courses created") }}</div>
         <div class="course-meta">{{ _("Help others learn something new.") }}</div>
diff --git a/lms/templates/courses_under_review.html b/lms/templates/courses_under_review.html
index 394ec66e..d825513a 100644
--- a/lms/templates/courses_under_review.html
+++ b/lms/templates/courses_under_review.html
@@ -9,11 +9,10 @@
 
 {% else %}
 <div class="empty-state">
-    <div>
-        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-    </div>
+    <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
     <div class="empty-state-text">
         <div class="empty-state-heading">{{ _("No courses under review") }}</div>
+        <div class="course-meta">{{ _("When a course gets submitted for review, it will be listed here.") }}</div>
     </div>
 </div>
 {% endif %}
diff --git a/lms/www/batch/quiz_list.html b/lms/www/batch/quiz_list.html
index 8a34f17b..eecd28c8 100644
--- a/lms/www/batch/quiz_list.html
+++ b/lms/www/batch/quiz_list.html
@@ -12,10 +12,15 @@
 {% block content %}
 <div class="common-page-style">
     <div class="container">
-        {% 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>
 
+        <a class="btn btn-secondary btn-sm pull-right" href="/quizzes/new-quiz">
+            {{ _("Add Quiz") }}
+        </a>
+        <div class="course-home-headings">
+            {{ _("Quiz List") }}
+        </div>
+
+        {% if quiz_list | length %}
         <div class="common-card-style">
             <table class="table">
 
@@ -48,13 +53,14 @@
 
         {% else %}
         <div class="empty-state">
+            <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
             <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>
+                <div class="empty-state-heading">
+                    {{ _("You have not created any quiz yet.") }}
+                </div>
+                <div class="course-meta ">
+                    {{ _("Create a quiz and add it to your course to engage your users.") }}
+                </div>
             </div>
         </div>
         {% endif %}
diff --git a/lms/www/community/index.html b/lms/www/community/index.html
index 7cb18823..f073a39e 100644
--- a/lms/www/community/index.html
+++ b/lms/www/community/index.html
@@ -5,7 +5,7 @@
 <div class="common-page-style">
   <div class="container">
 
-    <input class="search" id="search-user" placeholder="{{ _('Try a Name, Company, or Industry') }}">
+    <input class="search pull-right" id="search-user" placeholder="{{ _('Search') }}">
 
     <div class="course-home-headings">{{ _("Community") }} </div>
 
diff --git a/lms/www/courses/index.html b/lms/www/courses/index.html
index 10dc5dd7..e57a5da9 100644
--- a/lms/www/courses/index.html
+++ b/lms/www/courses/index.html
@@ -6,29 +6,33 @@
 
 {% block content %}
 <div class="common-page-style">
-  <div class="container">
-    {% if restriction.restrict %}
-    {% set profile_link = "<a href='/edit-profile'> profile </a>" %}
-    <div class="empty-state">
-      <div class="course-home-headings text-center mb-0" style="color: inherit;">{{ _("You haven't completed your profile.") }}</div>
-      <p class="small text-center">{{ _("Complete your {0} to access the courses.").format(profile_link) }}</p>
+    <div class="container">
+        {% if restriction.restrict %}
+        {% set profile_link = "<a href='/edit-profile'> profile </a>" %}
+        <div class="empty-state">
+            <div class="course-home-headings text-center mb-0" style="color: inherit;">
+                {{ _("You haven't completed your profile.") }}
+            </div>
+            <p class="small text-center">
+                {{ _("Complete your {0} to access the courses.").format(profile_link) }}
+            </p>
+        </div>
+
+        {% else %}
+        {% include "lms/templates/search_course/search_course.html" %}
+
+        <div class="course-list">
+            {% set courses = live_courses %}
+            {% set title = _("Live Courses ({0})").format(courses | length) %}
+            {% set classes = "live-courses" %}
+            {% include "lms/templates/course_list.html" %}
+
+            {% set courses = upcoming_courses %}
+            {% set title = _("Upcoming Courses ({0})").format(courses | length) %}
+            {% set classes = "upcoming-courses mt-10" %}
+            {% include "lms/templates/course_list.html" %}
+        </div>
+        {% endif %}
     </div>
-
-    {% else %}
-    {% include "lms/templates/search_course/search_course.html" %}
-
-    <div class="course-list">
-      {% set courses = live_courses %}
-      {% set title = _("Live Courses ({0})").format(courses | length) %}
-      {% set classes = "live-courses" %}
-      {% include "lms/templates/course_list.html" %}
-
-      {% set courses = upcoming_courses %}
-      {% set title = _("Upcoming Courses ({0})").format(courses | length) %}
-      {% set classes = "upcoming-courses mt-10" %}
-      {% include "lms/templates/course_list.html" %}
-    </div>
-    {% endif %}
-  </div>
 </div>
 {% endblock %}
diff --git a/lms/www/jobs/index.html b/lms/www/jobs/index.html
index fea346ff..d1b448fa 100644
--- a/lms/www/jobs/index.html
+++ b/lms/www/jobs/index.html
@@ -9,7 +9,7 @@
 <div class="common-page-style">
 
     <div class="container">
-        {% if allow_posting and jobs | length %}
+        {% if allow_posting %}
         <a class="button is-primary pull-right" href="/job-opportunity?new=1">{{ _("Post a Job") }}</a>
         {% endif %}
 
@@ -48,18 +48,11 @@
     {% else %}
 
     <div class="empty-state">
-        <div>
-            <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-        </div>
+        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
         <div class="empty-state-text">
             <div class="empty-state-heading">{{ _("No open jobs") }}</div>
             <div class="course-meta">{{ _("There are no job openings at present.") }}</div>
         </div>
-        <div>
-            {% if allow_posting %}
-            <a class="button is-secondary dark-links m-auto" href="/job-opportunity?new=1">{{ _("Post a Job") }}</a>
-            {% endif %}
-        </div>
     </div>
     {% endif %}
     </div>