diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index ea5d9ad..ba0c963 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -429,3 +429,11 @@ ul, li {
 .nav-pills > li > a {
   border-radius: 0px;
 }
+
+.float-button{
+  float: right;
+  position: fixed;
+  bottom: 5%;
+  right: 5%;
+  font-size: 20px;
+}
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 617e8cb..333dd6e 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -42,7 +42,6 @@
             </ul>
         </div>
     </div>
-
         {% if user|has_role:'professor' or user|has_role:'system_admin' %}
             <div class="panel panel-primary">
                 <div class="panel-heading">
@@ -146,6 +145,9 @@
             {% trans 'No courses found' %}
         {% endif %}-->
     </div>
+         {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+            <a href="{% url 'course:create' %}" class="btn btn-primary btn-fab float-button"><i class="fa fa-plus material-icons"></i></a>
+         {% endif %}
         <div class="col-md-12">
         <nav aria-label="Page navigation">
             <ul class="pagination">
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index be98ba3..8780590 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -29,7 +29,8 @@
                 <li><a href="{% url 'core:home' %}">{% trans "Home" %}</a></li>
                 <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
                 <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-                <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
+                <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
+                <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
             </ul>
         </div>
     </div>
--
libgit2 0.21.2