Change UI in Navbar

- Adds dropdown for instructor | Statistics
- Adds dropdown for coordinator | Workshops
- fixed navbar throughtout the website

20 files changed, 436 insertions, 259 deletions

diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css
index abace10..903bbb9 100644
--- a/workshop_app/static/workshop_app/css/index.css
+++ b/workshop_app/static/workshop_app/css/index.css
@@ -1,16 +1,16 @@
 /* Responsive layout - when the screen is less than 800px wide, make the two columns stack on top of each other instead of next to each other */
 @media screen and (max-width: 800px) {
-    .leftcolumn, .rightcolumn { 
+    .leftcolumn, .rightcolumn {
         width: 100%;
         padding: 0;
 
     },
- 
+
 }
 
 ul.topnav {
     list-style-type: none;
-    margin: 10px;
+    margin: 2px;
     padding: 0;
     overflow: hidden;
 
@@ -20,31 +20,30 @@ ul.topnav li {float: right;}
 
 ul.topnav li a {
     display: block;
-    color: black;
+    color: white;
     font-family: "Helvatica", arial, sans-serif;
     text-align: center;
-    padding: 14px 16px;
+    padding: 10px 16px;
     text-decoration: none;
 }
 
 ul.topnav li a:hover:not(.active) {
-  background-color: #3bb1d1;
-  color:white;
-  padding: 14px 16px;
+  background-color: white;
+  color: black;
+  padding: 10px 16px;
 }
 
 ul.topnav li.right {float: right;}
 
 @media screen and (max-width: 600px){
-    ul.topnav li.right, 
+    ul.topnav li.right,
     ul.topnav li {float: none;}
 }
 
 /**/
-.container {
-  width: 100%;
-  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-  align-content: center;
+.coverbox {
+    width: 90%;
+  margin: auto;
 }
 
 .row {
@@ -60,17 +59,23 @@ ul.topnav li.right {float: right;}
 
 }
 
+#r1 {
+    background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
+    height: 60px;
+    margin: 1px;
+    font-family: Sans-serif, "Arial";
+}
 
 #r1_c1
 {
-  font-size: 27px;
-  background: url("../img/hd_bg.png") no-repeat left top;
-  padding-bottom: 35px;
+  font-size: 18px;
+  padding-top: 14px;
   text-align: middle;
-  padding-top: 25px;
-  font-family: aaragh;  
+  color:white;
 }
 
+
+
 .rslides {
   position: relative;
   list-style: none;
@@ -101,6 +106,10 @@ ul.topnav li.right {float: right;}
   width: 100%;
   }
 
+#r2 {
+    padding-top: 10px;
+}
+
 #r2_c1 {
   margin: auto;
   width: 100%;
@@ -116,11 +125,10 @@ ul.topnav li.right {float: right;}
   color: white;
   background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
   padding-bottom: 25px;
-  margin-top: 15px; 
+  margin-top: 15px;
 }
 
 
-
 #r5 {
   width: 100%;
 }
@@ -128,14 +136,14 @@ ul.topnav li.right {float: right;}
 #r5_c1 {
   text-align: center;
   font-size: 2vw;
-  font-family: aaragh; 
+  font-family: aaragh;
   margin-top: 10px;
 
 }
 
 #r5_c2 {
-  font-family: aaragh; 
-  
+  font-family: aaragh;
+
 }
 
 #r5_c3 {
@@ -147,12 +155,13 @@ ul.topnav li.right {float: right;}
   margin-top: 15px;
   width: 100%;
   background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
-  
+  align-items: center;
+
 }
 
 #r6_c2 {
   text-align: center;
-  font-family: aaragh;  
+  font-family: aaragh;
   color: white;
 }
 
@@ -162,7 +171,6 @@ ul.topnav li.right {float: right;}
   overflow: hidden;
   padding: 0;
   margin: 0;
-  width: 10px;
   }
 
 .tslides li {
@@ -217,9 +225,8 @@ ul.topnav li.right {float: right;}
 
 #r8_c2 {
   font-size: 16px;
-  
   text-align: center;
-  
+
 }
 
 #social {
@@ -229,7 +236,6 @@ ul.topnav li.right {float: right;}
 #r8_c4 {
   text-align: center;
   font-size: 12px;
-  
   width: 100%;
 }
 
diff --git a/workshop_app/static/workshop_app/css/slick-theme.css b/workshop_app/static/workshop_app/css/slick-theme.css
index 46c87bf..f084346 100644
--- a/workshop_app/static/workshop_app/css/slick-theme.css
+++ b/workshop_app/static/workshop_app/css/slick-theme.css
@@ -26,7 +26,7 @@
     top: 50%;
 
     display: block;
-
+    border-radius:3;
     width: 30px;
     height: 35px;
     padding: 0;
@@ -67,9 +67,9 @@
     font-family: 'slick';
     font-size: 40px;
     line-height: 1;
-
+    border-radius:3;
     opacity: 3;
-    color: ;
+    color:black;
 
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css
index c0a38e8..f04b48f 100644
--- a/workshop_app/static/workshop_app/css/sticky-footer.css
+++ b/workshop_app/static/workshop_app/css/sticky-footer.css
@@ -48,4 +48,4 @@
   left: 0;
   background-color: #efefef;
   text-align: center;
-}
\ No newline at end of file
+}
diff --git a/workshop_app/templates/workshop_app/booking.html b/workshop_app/templates/workshop_app/booking.html
index 1937734..bb372a4 100644
--- a/workshop_app/templates/workshop_app/booking.html
+++ b/workshop_app/templates/workshop_app/booking.html
@@ -1,7 +1,7 @@
 {% extends 'workshop_app/base.html' %}
 
 {% block title %}
-	Booking
+	Book a Workshop
 {% endblock %}
 
 
@@ -11,12 +11,12 @@
  	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
 	<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css">
-	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>	
+	<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 
 	<script>
 	// Button function
 		function sendData(d){
-			var check_count;		
+			var check_count;
 			//For queue
 			var URL = "{{ URL_ROOT }}/book_workshop/";
 				c = d + ',0';
@@ -26,7 +26,7 @@
 					async: false,
 					type: "POST",
 					data: {
-						c, 
+						c,
 						csrfmiddlewaretoken: $("input[name=csrfmiddlewaretoken]").val()
 					},
 					success:function(response){
@@ -48,7 +48,7 @@
 						"Confirm": function(){
 						if($('#one').is(":checked") && $('#two').is(":checked") && $('#three').is(":checked")){
 								booking_confirmed(d);
-								$(this).dialog("close");	
+								$(this).dialog("close");
 						} else {
 								alert("Please select all the checkboxes.");
 								}
@@ -58,7 +58,7 @@
 						}
 					}
 				});
-			$dialog.dialog('open');	
+			$dialog.dialog('open');
 		}
 
 		function booking_confirmed(d){
@@ -68,10 +68,10 @@
 					url: URL,
 					type: "POST",
 					data: {
-						d, 
+						d,
 						csrfmiddlewaretoken: $("input[name=csrfmiddlewaretoken]").val()
 					},
-				
+
 					success:function(response){
 						window.location.reload();
 						alert("success: " + response);
@@ -86,18 +86,24 @@
 	<nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header" class="active">
-		  <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a>
+		  <a class="navbar-brand" href="#">FOSSEE Python Workshops</a>
 		</div>
 		<ul class="nav navbar-nav">
-		  <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li>
-		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-		  <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
-		  <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+		  <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li>
+      <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+              <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+              <li class="active"><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+              <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+          </ul>
+      </li>
 		  <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-		  <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
-		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+		    <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+		    <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
+		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li>
 		  <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 		</ul>
 	  	</div>
diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html
index 1cb5a31..cffcb7d 100644
--- a/workshop_app/templates/workshop_app/create_workshop.html
+++ b/workshop_app/templates/workshop_app/create_workshop.html
@@ -6,7 +6,8 @@
 
   {% block extra %}
     <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+    <script src="{{URL_ROOT}}/static/workshop_app/js/bootstrap-3.3.7.min.js"></script>
     <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
     <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
   {% endblock %}
@@ -15,17 +16,24 @@
   <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
       <div class="navbar-header">
-        <a class="navbar-brand" href="{{URL_ROOT}}/manage/">Home</a>
+        <li class="navbar-brand">FOSSEE Python Workshops</li>
       </div>
       <ul class="nav navbar-nav">
         <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-        <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-       <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-       <li><a href="{{ URL_ROOT }}/statistics/">Workshop stats</a></li>
-       <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
+        <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+        <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+          <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
+          <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+                  <span class="caret"></span></a>
+              <ul class="dropdown-menu">
+                  <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+                  <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+              </ul>
+          </li>
+        <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name }} </a></li>
         <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
       </ul>
     </div>
diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html
index 606b5c7..23a8827 100644
--- a/workshop_app/templates/workshop_app/edit_profile.html
+++ b/workshop_app/templates/workshop_app/edit_profile.html
@@ -7,32 +7,45 @@
 {% block header %}
   <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="#">FOSSEE Python Workshops</a>
+        </div>
      {% if request.user.profile.position == 'instructor' %}
-      <div class="navbar-header">
-        <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a>
-      </div>
-          <ul class="nav navbar-nav">
-            <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
-            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
-          </ul>
+		    <ul class="nav navbar-nav">
+		        <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
+		        <li ><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+		        <li><a href="{{ URL_ROOT }}/manage/"> Workshops</a></li>
+		    </ul>
         {% else %}
-         <div class="navbar-header">
-          <a class="navbar-brand" href="{{ URL_ROOT }}/book/">Home</a>
-          </div>
           <ul class="nav navbar-nav">
-            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-            <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-            <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
-            <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/"> Workshop Status</a></li>
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+                    <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                    <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+                    <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+                </ul>
+            </li>
             <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-            <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
           </ul>
         {% endif %}
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+          {% if request.user.profile.position == 'instructor' %}
+		      <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
+          <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+                  <span class="caret"></span></a>
+              <ul class="dropdown-menu">
+                  <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+                  <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+              </ul>
+          </li>
+          {% else %}
+          <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+          <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
+          {% endif %}
+		      <li class="active"><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{request.user.first_name }} </a></li>
         <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
       </ul>
     </div>
diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html
index 80d58c8..166ed55 100644
--- a/workshop_app/templates/workshop_app/how_to_participate.html
+++ b/workshop_app/templates/workshop_app/how_to_participate.html
@@ -10,6 +10,23 @@
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+  <link href='//fonts.googleapis.com/css?family=Antic Slab' rel='stylesheet'>
+  <style>
+   h1 {
+       font-family: 'Antic Slab';
+       color: #2952a2;
+   }
+   h4 {
+       padding-left: 3%;
+       padding-top: 1%;
+       color: #04a9cf;
+   }
+   img {
+       display: block;
+       margin: 0 auto;
+   }
+
+  </style>
 {% endblock %}
 
 {% block header %}
@@ -17,28 +34,36 @@
   <div class="container-fluid">
   {% if request.user.profile.position == 'coordinator' %}
   	<div class="navbar-header">
-		  <a class="navbar-brand"  href="{{ URL_ROOT}}/book/">Home</a>
+		  <a class="navbar-brand"  href="#">FOSSEE Python Workshops</a>
 	</div>
 		<ul class="nav navbar-nav">
-		  <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li>
-		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-		  <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
-		  <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+		  <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li>
+      <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+              <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+              <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+              <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+          </ul>
+      </li>
 		  <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-		  <li class="active"><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
-		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+		    <li class="active"><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+		    <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
+	      <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li>
 		  <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 		</ul>
   {% else %}
 	<div class="navbar-header">
-	  <a class="navbar-brand" href="{{URL_ROOT}}/">FOSSEE Workshops</a>
+	  <a class="navbar-brand" href="{{URL_ROOT}}/">FOSSEE Python Workshops</a>
 	</div>
 	<ul class="nav navbar-nav navbar-right">
-	  <li class="active"><a href="{{ URL_ROOT }}/how_to_participate/"><span class="glyphicon glyphicon-user"></span> How to Participate</a></li>
-	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
-	  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+      <li><a href="{{URL_ROOT}}/register">Register</a></li>
+      <li><a href="{{URL_ROOT}}/login">Login</a></li>
+      <li class="active"><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+      <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+      <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
 	</ul>
   {% endif %}
   	</div>
@@ -47,10 +72,22 @@
 
 {% block content %}
 
-	<div class="container-fluid text-center" >
+	<div class="container-fluid" >
+      <div class="row">
+          <div class="col-12">
+              <ul>
+                  <h1>Steps for conducting workshop</h1>
+                  <h4><li>Register on this website as a Coordinator</li></h4>
+                  <h4><li>Login using your credentials and propose a workshop or select a workshop from the list of available workshops</li></h4>
+                  <h4><li>Wait for instructor approval till you receive a confirmation mail</li></h4>
+                  <h4><li>Once the workshop request/proposal is approved, instructor will send you other workshop details</li></h4>
+                  <h4> <li>Conduct the workshop</li></h4>
+              </ul>
+          </div>
+      </div>
       <div class="row">
-          <div class="col-md-12">
-		          <img style="width:100%; height:auto;" src="{{ URL_ROOT }}/static/workshop_app/img/structure.png">
+          <div class="col-12">
+		          <img style="width:auto ; height:auto; " class="img-responsive" src="{{ URL_ROOT }}/static/workshop_app/img/structure.png">
           </div>
       </div>
 		<br><br>
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index a2e8966..c6cda03 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -20,13 +20,13 @@
     <!-- Add icon library -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 
-    
+
     <script type="text/javascript" src="//code.jquery.com/jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
 
     <!-- Custom JS -->
-    <script src="{{ URL_ROOT }}/static/workshop_app/js/index.js"></script> 
-    <script src="{{ URL_ROOT }}/static/workshop_app/js/slick.js"></script> 
+    <script src="{{ URL_ROOT }}/static/workshop_app/js/index.js"></script>
+    <script src="{{ URL_ROOT }}/static/workshop_app/js/slick.js"></script>
 
 
     <title>Welcome</title>
@@ -51,14 +51,13 @@ $(document).ready(function(){
   $('.slick_carousal').slick({
     infinite: true,
     slidesToShow: 3,
-    
     slidesToScroll: 1
   });
 });
 </script>
 
 </head>
-<body class="container">
+<body >
 
 <div class="row" id="r1">
     <div class="col-md-6" id="r1_c1">
@@ -70,12 +69,12 @@ $(document).ready(function(){
           <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
           <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
           <li><a href="{{URL_ROOT}}/login">Login</a></li>
-          <li><a href="{{URL_ROOT}}/register">Sign Up</a></li>
+          <li><a href="{{URL_ROOT}}/register"> Register</a></li>
         </ul>
     </div>
 </div>
-
-<div class="row" id="r2">
+<div class="coverbox">
+    <div class="row" id="r2">
     <div class="col-md-6 rslides" id="r2_c1">
 
         <img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_1.png" >
@@ -101,7 +100,7 @@ $(document).ready(function(){
 </div>
 
 
-<div class="row slick_carousal" id="r4">
+<div class="row slick_carousal" id="r4" style="width:95%;">
     <div class="col-4">
         <br>
         <a href="{{URL_ROOT}}/view_workshoptype_details/4"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_1.png"></a>
@@ -115,7 +114,7 @@ $(document).ready(function(){
         <a href="{{URL_ROOT}}/self_workshop"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_3.png"></a>
     </div>
 
-    <div class="col-md-4">
+    <div class="col-4">
         <br>
         <a href="#"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_4.png"></a>
     </div>
@@ -170,13 +169,13 @@ $(document).ready(function(){
         Phone: (+91) 22 2576 4133 <br>
         Email: workshops[at]fossee[dot]in
     </div>
- 
+
     <div class="col-md-4" id="r8_c3" >
         <div id="social">
                 <br> <br>
                 <a href="https://www.facebook.com/FOSSEENMEICT/" target="_blank" class="fa fa-facebook"></a> &nbsp;
                 <a href="https://plus.google.com/u/0/104012350840765676803" target="_blank" class="fa fa-google"></a> &nbsp;
-                <a href="https://www.youtube.com/channel/UCMtt6exSCmZI7JU73S6Wz_A" target="_blank" class="fa fa-youtube"></a> 
+                <a href="https://www.youtube.com/channel/UCMtt6exSCmZI7JU73S6Wz_A" target="_blank" class="fa fa-youtube"></a>
         </div>
     </div>
 
@@ -184,9 +183,10 @@ $(document).ready(function(){
         <hr>
         The FOSSEE project is funded by the National Mission on Education through ICT, MHRD, Government of India.  <br>
         This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License
-
+        <br><br>
     </div>
 </div>
+</div>
 
 </body>
 </html>
diff --git a/workshop_app/templates/workshop_app/login.html b/workshop_app/templates/workshop_app/login.html
index e069cd9..37e6094 100644
--- a/workshop_app/templates/workshop_app/login.html
+++ b/workshop_app/templates/workshop_app/login.html
@@ -8,12 +8,15 @@
  <nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
 	<div class="navbar-header">
-	  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
+	  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Python Workshops</a>
 	</div>
 
 	<ul class="nav navbar-nav navbar-right">
-	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
-	  <li class="active"><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+      <li><a href="{{URL_ROOT}}/register">Register</a></li>
+      <li class="active"><a href="{{URL_ROOT}}/login">Login</a></li>
+      <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+      <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+      <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
 	</ul>
   	</div>
   </nav>
diff --git a/workshop_app/templates/workshop_app/logout.html b/workshop_app/templates/workshop_app/logout.html
index f136296..d83a08d 100644
--- a/workshop_app/templates/workshop_app/logout.html
+++ b/workshop_app/templates/workshop_app/logout.html
@@ -8,12 +8,15 @@
  <nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
 	<div class="navbar-header">
-	  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
+	  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Python Workshops</a>
 	</div>
 
 	<ul class="nav navbar-nav navbar-right">
-	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
-	  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+      <li><a href="{{URL_ROOT}}/register">Register</a></li>
+      <li><a href="{{URL_ROOT}}/login">Login</a></li>
+      <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+      <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+      <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
 	</ul>
   	</div>
   </nav>
diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html
index d9fb6b1..28c5606 100644
--- a/workshop_app/templates/workshop_app/manage.html
+++ b/workshop_app/templates/workshop_app/manage.html
@@ -1,20 +1,32 @@
 {% extends 'workshop_app/base.html' %}
 
+
+{% block title %}
+    Workshops
+{% endblock %}
+
 {% block header %}
    <nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header">
-		  <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a>
-		</div>
+        <a class="navbar-brand" href="#">FOSSEE Python Workshops</a>
+    </div>
 		<ul class="nav navbar-nav">
 		  <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-		   <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-		   <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-		   <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-		   <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
+		   <li ><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+		   <li class="active"><a href="{{ URL_ROOT }}/manage/"> Workshops</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
-		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+		    <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
+        <li class="dropdown">
+            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+                <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+                <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+                <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+            </ul>
+        </li>
+		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{request.user.first_name }} </a></li>
 		  <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 		</ul>
 		</div>
@@ -49,13 +61,13 @@
 					csrfmiddlewaretoken: $("input[name=csrfmiddlewaretoken]").val()
 				},
 			});
-			
+
 			window.location.reload();
 			alert("Refreshing Page please wait, if you don't see your changes, please refresh this page again.");
 		}
 	</script>
 
-	
+
 {% endblock %}
 
 
@@ -117,11 +129,11 @@
 	{% else %}
 		<div class="container">
 			<div class="jumbotron">
-    			<h1>Welcome Instructor</h1>      
+    			<h1>Welcome {{ user.first_name }}</h1>
     			<p>Please navigate to <b>View Workshop list</b> and depending upon
     			your expertise and availability create a workshop by going to
     			<b>Create Workshop</b>. you can also check any workshop
-    			requests by going to <b>My Workshops</b></p>
+    			requests by going to <b>Workshop Status</b></p>
 
   			</div>
 		</div>
diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html
index 80ab7f1..1602ef9 100644
--- a/workshop_app/templates/workshop_app/my_workshops.html
+++ b/workshop_app/templates/workshop_app/my_workshops.html
@@ -1,7 +1,7 @@
 {% extends "workshop_app/base.html" %}
 
 {% block title %}
-	My Workshops
+	 Workshop Status
 {% endblock %}
 
 {% block extra %}
@@ -27,7 +27,7 @@
 				type: "POST",
 				dataType: 'json',
 				data: {
-					d, 
+					d,
 					csrfmiddlewaretoken: $("input[name=csrfmiddlewaretoken]").val()
 				},
 			});
@@ -47,7 +47,7 @@
 	    	});
 		});
 
-			function changeDate(date){ 
+			function changeDate(date){
 				var previous_date = new Date(date);
 				var dateToday = new Date();
     			var upto = new Date();
@@ -67,7 +67,7 @@
 	          			dateFormat:"yy-mm-dd",
 			        });
 			        $(".ui-dialog-content").dialog("close");
-			        $('.myDialogP'+id).dialog();	
+			        $('.myDialogP'+id).dialog();
 
 			    } else {
 			    	var counter = date.split(" ");
@@ -80,7 +80,7 @@
 	          			maxDate: upto,
 	          			dateFormat:"yy-mm-dd",
 			        });
-			       	 $(".ui-dialog-content").dialog("close");	
+			       	 $(".ui-dialog-content").dialog("close");
 			       	 $('.myDialogR'+id).dialog();
 
 			       	}
@@ -103,7 +103,7 @@
 					async: false,
 					type: "POST",
 					data: {
-						data_c, 
+						data_c,
 						csrfmiddlewaretoken: $("input[name=csrfmiddlewaretoken]").val()
 					},
 					success:function(response){
@@ -115,39 +115,51 @@
 			};
 
     </script>
-    
 {% endblock %}
 
 {% block header %}
     <nav class="navbar navbar-default navbar-custom">
       <div class="container-fluid">
+          <div class="navbar-header">
+       		    <a class="navbar-brand" href="#">FOSSEE Python Workshops</a>
+          </div>
       {% if request.user.profile.position == 'instructor' %}
-        <div class="navbar-header">
-       		<a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a>
-        </div>
           <ul class="nav navbar-nav">
             <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
-            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
+            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+            <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li>
           </ul>
         {% else %}
-        <div class="navbar-header">
-       		<a class="navbar-brand" href="{{URL_ROOT}}/book/">Home</a>
-        </div>
           <ul class="nav navbar-nav">
-            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-            <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-            <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
-            <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+            <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+                    <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                    <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+                    <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+                </ul>
+            </li>
             <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-	    <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
           </ul>
         {% endif %}
 
         <ul class="nav navbar-nav navbar-right">
-          <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+            {% if request.user.profile.position == 'instructor' %}
+            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+                    <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                    <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+                    <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+                </ul>
+            </li>
+            {% else %}
+	          <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+            <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
+            {% endif %}
+          <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li>
           <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
         </ul>
       </div>
@@ -159,7 +171,7 @@
 {% if workshop_occurences %}
 	<h3 align="center" style="color:#2952a2;">The status of your workshops </h3>
 	<br>
-	
+
 	<!-- Pending View -->
 	<div class="container">
 	{% if request.user.profile.position == 'instructor' %}
@@ -200,7 +212,6 @@
 							{% endif %}
 						</tr>
 					</tbody>
-				
 			{% endfor %}
 		</table>
 	</div>
@@ -358,12 +369,12 @@
 							{% endif %}
 								<td>{{ workshop.requested_workshop_title |  capfirst }}</td>
 								<td>{{ workshop.requested_workshop_date  | date }}</td>
-							
+
 								<td><span class = "label label-danger">{{ workshop.status }}</span></td>
 						{% endif %}
 						</tr>
 					</tbody>
-				
+
 			{% endfor %}
 		</table>
 	</div>
@@ -399,7 +410,7 @@
 	{% if request.user.profile.position == 'instructor' %}
 		<div class="container">
 			<div class="jumbotron">
-				<h1>Welcome Instructor</h1>      
+				<h1>Welcome {{ user.first_name }}</h1>
 				<p>Your workshop related information will be shown here, Please navigate to <b>Workshop list</b> and depending upon
 				your expertise and availability create a workshop by going to
 				<b>Create Workshop</b>.</p>
@@ -408,9 +419,9 @@
 	{% else %}
 		<div class="container">
 			<div class="jumbotron">
-				<h1>Welcome Coordinator</h1>
+				<h1>Welcome {{ user.first_name }}</h1>
 				<p>Information Related to your workshops will be shown here, you can also
-				propose a Workshop as per your available date in <strong>Propose a Workshop tab</strong> .</p>
+				propose a Workshop as per your available date in <strong>Workshops > Propose a Workshop tab</strong> .</p>
 			</div>
 		</div>
 	{% endif %}
diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html
index 569e3fb..6b1a0fb 100644
--- a/workshop_app/templates/workshop_app/profile_updated.html
+++ b/workshop_app/templates/workshop_app/profile_updated.html
@@ -4,41 +4,59 @@
   Profile Changing
 {% endblock %}
 
+
 {% block header %}
   <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="#">FOSSEE Python Workshops </a>
+        </div>
       {% if request.user.profile.position == 'instructor' %}
-      <div class="navbar-header">
-        <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a>
-      </div>
       <ul class="nav navbar-nav">
         <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-        <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li>
-        <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-        <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-        <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
+        <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+        <li><a href="{{ URL_ROOT }}/manage/">Workshops </a></li>
       </ul>
       {% else %}
-      <div class="navbar-header">
-        <a class="navbar-brand" href="{{URL_ROOT}}/book/">Home</a>
-      </div>
       <ul class="nav navbar-nav">
-        <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-        <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-        <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
-        <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
-        <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-        <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+          <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+          <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+                  <span class="caret"></span></a>
+              <ul class="dropdown-menu">
+                  <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+                  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+              </ul>
+          </li>
+        <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li>
       </ul>
       {% endif %}
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+          {% if request.user.profile.position == 'instructor' %}
+          <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li>
+          <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+                  <span class="caret"></span></a>
+              <ul class="dropdown-menu">
+                  <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+                  <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+              </ul>
+          </li>
+          {% else %}
+          <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+          <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
+          {% endif %}
+		    <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li>
         <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
       </ul>
       </div>
   </nav>
 {% endblock %}
 
+  {% block extra %}
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+  <script src="{{URL_ROOT}}/static/workshop_app/js/bootstrap-3.3.7.min.js"></script>
+  {% endblock %}
 {% block content %}
   <div class="container">
     <div class="jumbotron">
diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html
index a237f46..db1dcfd 100644
--- a/workshop_app/templates/workshop_app/propose_workshop.html
+++ b/workshop_app/templates/workshop_app/propose_workshop.html
@@ -9,6 +9,8 @@
 
     <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
     <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+    <script src="{{URL_ROOT}}/static/workshop_app/js/bootstrap-3.3.7.min.js"></script>
 
     <script>
     var dateToday = new Date();
@@ -35,18 +37,24 @@
   <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
       <div class="navbar-header">
-        <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a>
+        <a class="navbar-brand" href="#">FOSSEE Python Workshops</a>
       </div>
       <ul class="nav navbar-nav">
-       <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-       <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-       <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
-       <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+       <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+       <li class="dropdown">
+           <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+               <span class="caret"></span></a>
+           <ul class="dropdown-menu">
+               <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+               <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+           </ul>
+       </li>
        <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-       <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+          <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+          <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
+        <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li>
         <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
       </ul>
     </div>
@@ -69,4 +77,4 @@
       <button class="btn btn-success" type="submit">Submit</button>
     </form>
   </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/registration/register.html b/workshop_app/templates/workshop_app/registration/register.html
index c5ce9c6..a2a3edd 100644
--- a/workshop_app/templates/workshop_app/registration/register.html
+++ b/workshop_app/templates/workshop_app/registration/register.html
@@ -8,18 +8,21 @@
 	 <nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
 		<div class="navbar-header">
-		  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
+		  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Python Workshops</a>
 		</div>
 
 		<ul class="nav navbar-nav navbar-right">
-		  <li class="active"><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
-		  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+        <li class="active"><a href="{{URL_ROOT}}/register">Sign Up</a></li>
+        <li><a href="{{URL_ROOT}}/login">Login</a></li>
+        <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+        <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+        <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
 		</ul>
 	  	</div>
 	  </nav>
   {% endblock %}
 
- 
+
 {% block content %}
 
 	<style type="text/css">
@@ -27,7 +30,7 @@
     	content: "*";
     	color: red;
 		}
-		
+
 		.errorlist {
       color: red;
     }
diff --git a/workshop_app/templates/workshop_app/self_workshop.html b/workshop_app/templates/workshop_app/self_workshop.html
index b67ad52..8c6e7a4 100644
--- a/workshop_app/templates/workshop_app/self_workshop.html
+++ b/workshop_app/templates/workshop_app/self_workshop.html
@@ -17,8 +17,15 @@
  <nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
 	<div class="navbar-header">
-	  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
+	  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Python Workshops</a>
 	</div>
+	<ul class="nav navbar-nav navbar-right">
+      <li><a href="{{URL_ROOT}}/register">Register</a></li>
+      <li><a href="{{URL_ROOT}}/login">Login</a></li>
+      <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+      <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+      <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
+	</ul>
   	</div>
   </nav>
   {% endblock %}
@@ -73,7 +80,7 @@
 			</li>
 
 			<li class='ans'>
-				Complete all the lessons, exercises and quizzes in a module and then proceed to the next module. 
+				Complete all the lessons, exercises and quizzes in a module and then proceed to the next module.
 			</li>
 
 			<li class='ans'>
@@ -92,7 +99,7 @@
 
 			<li class='ans'>
 				The course will start on the 1st day of every month and closes on the last day of the month.
-			</li>		
+			</li>
 
 			</ul>
 		</ul>
diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html
index 8860f35..64779b6 100644
--- a/workshop_app/templates/workshop_app/view_faq.html
+++ b/workshop_app/templates/workshop_app/view_faq.html
@@ -18,28 +18,37 @@
  <nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
   {% if request.user.profile.position == 'coordinator' %}
-  	<div class="navbar-header">
-		  <a class="navbar-brand"  href="{{ URL_ROOT}}/book/">Home</a>
-	</div>
+	    <div class="navbar-header">
+	        <span class="navbar-brand" href="#">FOSSEE Python Workshops</span>
+	    </div>
 		<ul class="nav navbar-nav">
-		  <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li>
-		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-		  <li class="active"><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
-		  <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+		  <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li>
+      <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+              <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+              <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+              <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+          </ul>
+      </li>
 		  <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-		  <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
-		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+		    <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+		    <li class="active"><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
+		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li>
 		  <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 		</ul>
   {% else %}
-	<div class="navbar-header">
-	  <a class="navbar-brand" href="{{URL_ROOT}}/">FOSSEE Workshops</a>
-	</div>
+	  <div class="navbar-header">
+	      <span class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</span>
+	  </div>
 	<ul class="nav navbar-nav navbar-right">
-	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
-	  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+      <li><a href="{{URL_ROOT}}/register">Register</a></li>
+      <li><a href="{{URL_ROOT}}/login">Login</a></li>
+      <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+      <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+      <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
 	</ul>
 	{% endif %}
   	</div>
diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html
index b20724f..e95de6c 100644
--- a/workshop_app/templates/workshop_app/view_profile.html
+++ b/workshop_app/templates/workshop_app/view_profile.html
@@ -7,42 +7,60 @@
 {% block header %}
     <nav class="navbar navbar-default navbar-custom">
       <div class="container-fluid">
+          <div class="navbar-header">
+              <a class="navbar-brand" href="#">FOSSEE Python Workshops</a>
+          </div>
         {% if request.user.profile.position == 'instructor' %}
-        <div class="navbar-header">
-          <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a>
-        </div>
           <ul class="nav navbar-nav">
             <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
-            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+            <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li>
           </ul>
         {% else %}
-        <div class="navbar-header">
-          <a class="navbar-brand" href="{{URL_ROOT}}/book/">Home</a>
-        </div>
           <ul class="nav navbar-nav">
-            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a>
-            <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li></li>
-            <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
-            <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a>
+                <li class="dropdown">
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+                        <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+                        <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+                    </ul>
+                </li>
             <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-            <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
           </ul>
         {% endif %}
-        
+
         <ul class="nav navbar-nav navbar-right">
-          <li class="active"><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+            {% if request.user.profile.position == 'instructor' %}
+            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+                    <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                    <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+                    <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+                </ul>
+            </li>
+           {% else %}
+                    <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+                    <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li>
+          {% endif %}
+          <li class="active"><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name }} </a></li>
           <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
         </ul>
       </div>
     </nav>
-{% endblock %}
+    {% endblock %}
+
+    {% block extra %}
+          <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+          <script src="{{URL_ROOT}}/static/workshop_app/js/bootstrap-3.3.7.min.js"></script>
+    {% endblock %}
 
 {% csrf_token %}
 {% block content %}
-  
+
   <div class="container">
   <table class="table table-bordered">
   <tr>
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html
index e488561..60a57ad 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_details.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html
@@ -2,55 +2,64 @@
 {% extends 'workshop_app/base.html' %}
 
 {% block title %}
-	View Workshops Type List
+	View Workshop details
 {% endblock %}
 
 
 {% block header %}
 	<nav class="navbar navbar-default navbar-custom">
   <div class="container-fluid">
+      <div class="navbar-header">
+       		<a class="navbar-brand" href="{{URL_ROOT }}/">FOSSEE Python Workshops</a>
+      </div>
       {% if request.user.profile.position == 'instructor' %}
-        <div class="navbar-header">
-       		<a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a>
-        </div>
           <ul class="nav navbar-nav">
             <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-            <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
-            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-            <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+            <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li>
           </ul>
 
 	        <ul class="nav navbar-nav navbar-right">
-	            <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile</a></li>
+              <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
+              <li class="dropdown">
+                  <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+                      <span class="caret"></span></a>
+                  <ul class="dropdown-menu">
+                      <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+                      <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+                  </ul>
+              </li>
+              <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name }} </a></li>
 	            <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 	        </ul>
           {% elif request.user.profile.position == 'coordinator' %}
-        <div class="navbar-header">
-       		<a class="navbar-brand" href="{{URL_ROOT}}/book/">Home</a>
-        </div>
           <ul class="nav navbar-nav">
-            <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-            <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-            <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
-            <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li>
+            <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+            <li class="dropdown">
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+                    <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                    <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+                    <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+                </ul>
+            </li>
             <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li>
-	    <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
           </ul>
 
 	        <ul class="nav navbar-nav navbar-right">
-	            <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile</a></li>
+	            <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+              <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
+	            <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li>
 	            <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 	        </ul>
         {% else %}
-          <div class="navbar-header">
-       		    <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
-          </div>
 
 	<ul class="nav navbar-nav navbar-right">
-	  <li><a href="{{ URL_ROOT }}/how_to_participate/"><span class="glyphicon glyphicon-user"></span> How to Participate</a></li>
-	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
-	  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
+      <li><a href="{{URL_ROOT}}/register"> Register</a></li>
+      <li><a href="{{URL_ROOT}}/login">Login</a></li>
+      <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+      <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+      <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
 	</ul>
   {% endif %}
 
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html
index 10d4351..b2dc405 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_list.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html
@@ -1,7 +1,7 @@
 {% extends 'workshop_app/base.html' %}
 
 {% block title %}
-	View Details About Workshops
+	View List of available Workshops
 {% endblock %}
 
 {% block extra %}
@@ -39,7 +39,6 @@
 		font-size: 28px;
 		font-weight: bold;
 	    }
-
 	    .close:hover,
 	    .close:focus {
 		color: #000;
@@ -54,46 +53,53 @@
 
 {% block header %}
  <nav class="navbar navbar-default navbar-custom">
- {% if request.user.profile.position == 'coordinator' %}
  	<div class="container-fluid">
   	<div class="navbar-header">
-		  <a class="navbar-brand"  href="{{ URL_ROOT}}/book/">Home</a>
+		  <a class="navbar-brand"  href="#">FOSSEE Python Workshops</a>
 	</div>
+  {% if request.user.profile.position == 'coordinator' %}
 		<ul class="nav navbar-nav">
-		  <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li>
-		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-		  <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
-		  <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a>
+		  <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li>
+      <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops
+              <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+              <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li>
+              <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
+          </ul>
+      </li>
 		  <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li>
-		  <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
 		  </li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
-		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li>
+		    <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li>
+		    <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li>
+		  <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name}} </a></li>
 		  <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span>Logout</a></li>
 		</ul>
 	</div>
  {% elif request.user.profile.position == 'instructor' %}
-  <div class="navbar-header">
-      <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a>
-  </div>
   <ul class="nav navbar-nav">
       <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-      <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
-      <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li>
-      <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-      <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
+      <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li>
+      <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li>
   </ul>
 
 	<ul class="nav navbar-nav navbar-right">
-	    <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile</a></li>
+      <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li>
+      <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics
+              <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+              <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li>
+              <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li>
+          </ul>
+      </li>
+	    <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name}}</a></li>
 	    <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 	</ul>
   	</div>
     {% else %}
-    <div class="navbar-header">
-        <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
-    </div>
 
 	  <ul class="nav navbar-nav navbar-right">
 	      <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>