diff --git a/lms/lms/widgets/MemberCard.html b/lms/lms/widgets/MemberCard.html
index 580a1263..70906eb3 100644
--- a/lms/lms/widgets/MemberCard.html
+++ b/lms/lms/widgets/MemberCard.html
@@ -8,7 +8,7 @@
   <div> {{ member.headline }} </div>
   {% endif %}
 
-  {% set course_count = get_authored_courses(member.name) | length %}
+  {% set course_count = get_authored_courses(member.name, True) | length %}
   {% if show_course_count and course_count > 0 %}
   {% set suffix = "Courses" if course_count > 1 else "Course" %}
   <div class="">
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 62d0b8a0..e4b39e55 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -125,9 +125,10 @@ input[type=checkbox] {
 }
 
 .course-card-title {
-  font-weight: 600;
-  color: var(--gray-900);
-  margin-bottom: 1.25rem;
+    font-weight: 600;
+    color: var(--gray-900);
+    margin-bottom: 1.25rem;
+    font-size: 1.125rem;
 }
 
 .card-divider {
@@ -1399,8 +1400,8 @@ pre {
 
 .lms-nav .nav-link {
     color: var(--text-muted);
-    padding: 0 0 var(--padding-md);
-    margin-right: var(--margin-xl);
+    padding: var(--padding-md) 0;
+    margin: 0 var(--margin-md);
 }
 
 .lms-nav .nav-link.active {
@@ -1409,6 +1410,12 @@ pre {
   color: var(--text-color);
 }
 
+@media (min-width: 500px) {
+    .lms-nav .nav-item:first-child .nav-link {
+        margin-left: 0;
+    }
+}
+
 .lms-nav .nav-link:hover {
   color: inherit;
 }
@@ -1691,6 +1698,12 @@ li {
     cursor: pointer;
 }
 
+@media (min-width: 500px) {
+    .role:last-child {
+        margin-left: 5rem
+    }
+}
+
 .icon-xl {
     width: 2.75rem;
     height: 2.75rem;
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index f58db0b0..1bcc0d4a 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -1,4 +1,4 @@
-{% set courses = get_authored_courses(user or None, only_published=False) %}
+{% set courses = get_authored_courses(user or None, only_published or False) %}
 
 {% if courses | length %}
 <div class="cards-parent">
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index b8dab10b..1a121516 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -7,6 +7,8 @@
 {% block content %}
 {% set read_only = member.name != frappe.session.user %}
 {% set user = member.name %}
+{% set courses_created = get_authored_courses(member.name, True) %}
+{% set certificates = get_certificates(user) %}
 
 <div class="common-page-style profile-page">
     {{ ProfileBanner(member) }}
@@ -21,17 +23,21 @@
                     </a>
                 </li>
 
+                {% if courses_created | length %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#courses-created">
                         {{ _("Courses Created") }}
                     </a>
                 </li>
+                {% endif %}
 
+                {% if certificates | length %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#certificates">
                         {{ _("Certificates") }}
                     </a>
                 </li>
+                {% endif %}
 
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#settings">
@@ -55,13 +61,18 @@
                     {{ ProfileTabs(profile_tabs) }}
                 </div>
 
+                {% if courses_created | length %}
+                {% set only_published = True %}
                 <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
                     {% include "lms/templates/courses_created.html" %}
                 </div>
+                {% endif %}
 
+                {% if certificates | length %}
                 <div class="tab-pane fade" id="certificates" role="tabpanel" aria-labelledby="certificates">
                     {% include "lms/templates/certificates_section.html" %}
                 </div>
+                {% endif %}
 
                 <div class="tab-pane fade" id="settings" role="tabpanel" aria-labelledby="settings">
                     {{ RoleSettings(member) }}
@@ -92,7 +103,7 @@
         <div class="profile-name-section">
             <div class="profile-name" data-name="{{ member.name }}"> {{ member.full_name }} </div>
 
-            {% if get_authored_courses(member.name) | length %}
+            {% if courses_created | length %}
             <div class="creator-badge"> {{ _("Creator") }} </div>
             {% endif %}
 
@@ -167,7 +178,7 @@
                         {% if has_course_instructor_role(member.name) %} checked {% endif %}>
                         {{ _("Course Instructor") }}
                     </label>
-                    <label class="role ml-20">
+                    <label class="role">
                         <input type="checkbox" id="moderator" data-role="Course Moderator"
                             {% if has_course_moderator_role(member.name) %} checked {% endif %}>
                         {{ _("Course Moderator") }}