change UI

- Changes UI
- Changes landing page
- change in testcases-> test_models.py | 312
- staticstics template change
- removes commented chatbot code
- modifies .gitignore

28 files changed, 975 insertions, 539 deletions

diff --git a/.gitignore b/.gitignore
index e828331..e16318f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,7 @@ migrations/
 \#*#
 #Vim
 *.swp
+
+#images/gif
+*.png
+*.gif
diff --git a/static/workshop_app/css/new_index.css b/static/workshop_app/css/new_index.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/workshop_app/css/new_index.css
diff --git a/statistics_app/templates/statistics_app/profile_stats.html b/statistics_app/templates/statistics_app/profile_stats.html
index 2653d9d..c342898 100644
--- a/statistics_app/templates/statistics_app/profile_stats.html
+++ b/statistics_app/templates/statistics_app/profile_stats.html
@@ -14,7 +14,7 @@
 		  <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 }}/workshop_stats/" >Workshop Stats</a></li>
+		   <li><a href="{{ URL_ROOT }}/statistics/" >Workshop Stats</a></li>
 		   <li class="active"><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
diff --git a/statistics_app/templates/statistics_app/workshop_public_stats.html b/statistics_app/templates/statistics_app/workshop_public_stats.html
index 237bcbc..486c154 100644
--- a/statistics_app/templates/statistics_app/workshop_public_stats.html
+++ b/statistics_app/templates/statistics_app/workshop_public_stats.html
@@ -303,7 +303,7 @@
 			        $( "#visualization" ).dialog({
 					resizable: false,
 					draggable: true,
-			        title: 'State wise Completed Workshops(Map of India)',
+			        title: 'State wise(Map of India)',
 					closeOnEscape: true,
 					stack: true,
 					zIndex: 10000,
@@ -321,10 +321,11 @@
 					var opts = {
 					    region: 'IN',
 					    domain: 'IN',
-					    displayMode: 'regions',
+					    displayMode:  'regions',
 					    resolution: 'provinces',
-					    colorAxis: {colors: ['lightyellow', 'orange']},
-					    legend: {position: 'top'},
+					    colorAxis: {colors: ['lightyellow','orange']},
+					    
+
 					   	};
 
 					var geochart = new google.visualization.GeoChart(
diff --git a/statistics_app/templates/statistics_app/workshop_stats.html b/statistics_app/templates/statistics_app/workshop_stats.html
index 5328b2b..3bfce07 100644
--- a/statistics_app/templates/statistics_app/workshop_stats.html
+++ b/statistics_app/templates/statistics_app/workshop_stats.html
@@ -3,6 +3,7 @@
 {% block title %}
   Statistics
 {% endblock %}
+
 {% block header %}
    <nav class="navbar navbar-default navbar-custom">
 	  <div class="container-fluid">
@@ -13,7 +14,7 @@
 		  <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 class="active"><a href="{{ URL_ROOT }}/workshop_stats/" >Workshop Stats</a></li>
+		   <li class="active"><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 navbar-right">
@@ -224,20 +225,6 @@
 			        	myChart.destroy();
 			            }
 
-				    var dWidth = $(window).width() * 0.9;
-			        var dHeight = $(window).height() * 0.9;
-                
-			        $( "#myChartPie" ).dialog({
-					resizable: false,
-					draggable: true,
-			                title: 'Bar Chart',
-					closeOnEscape: true,
-					stack: true,
-					zIndex: 10000,
-					width: dWidth,
-					height: dHeight,    
-					modal: true
-					});
 			               
 			        document.getElementById("visualization").style.visibility='hidden';
 					myChart = new Chart(ctx1, {
@@ -294,22 +281,7 @@
 			        if(myChart){
 			        	myChart.destroy();
 			        }
-
-				    var dWidth = $(window).width() * 0.9;
-			        var dHeight = $(window).height() * 0.9;
-                
-			        $( "#myChartPie" ).dialog({
-					resizable: false,
-					draggable: true,
-			        title: 'Pie Chart',
-					closeOnEscape: true,
-					stack: true,
-					zIndex: 10000,
-					width: dWidth,
-					height: dHeight,    
-					modal: true
-					});
-	
+			        
 				document.getElementById("visualization").style.visibility='hidden';
 				myChart = new Chart(ctx1, {
 				    type: 'pie',
diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css
index ddf762f..eafc794 100644
--- a/workshop_app/static/workshop_app/css/index.css
+++ b/workshop_app/static/workshop_app/css/index.css
@@ -1,137 +1,241 @@
-/* ChatBox */
-
-#chat
- {
- position:absolute;
- width:150px;
- height:auto;
- padding:10px;
- background:#088A68;
- color:#EDEDED;
- text-align:center;
- font-family:Cambria;
- font-size:15px;
- bottom:0px;
- right:10px;
- cursor:pointer;
- }
- #chatBox
- {
- display:none;
- position:absolute;
- width:300px;
- height:400px;
- padding:5px;
- background:#EEEEEE;
- box-shadow:0 0 0.1em #000;
- font-family:Garamond;
- font-size:12px;
- bottom:0px;
- right:15px;
- cursor:pointer;
- }
- #close
- {
- position:absolute;
- width:21px;
- height:21px;
- /*padding:9px 7px 12px 7px;*/
- text-align:center;
- background:rgba(0,0,0,0.8);
- color:#FF7700;
- font-family:Cambria;
- right:0px;top:0px;
- }
-
- /* Alternate the background color of the output rows */
-.list-group-item:nth-child(even) {
-    background-color: #bdf1ac;
-}
-
-.chat-log {
-    max-height:300px;
-    overflow-y:scroll;
-}
-
- 
-
-body {
-  background-color: grey;
+/* 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 {   
+        width: 100%;
+        padding: 0;
+
+    },
+  
 }
 
-.container {
-  background-color: #C8C5B6;
-  width: 90%;
+ul.topnav {
+    list-style-type: none;
+    margin: 20px;
+    padding: 0;
+    overflow: hidden;   
 }
 
-.fossee-label {
-  color: #6D5847;
-  text-align: center;
-  font-size: 400%;
-  margin-top: 12%;
+ul.topnav li {float: right;}
+
+ul.topnav li a {
+    display: block;
+    color: black;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none;
 }
 
-.label-bar {
-  color: #6D5847;
-  margin-top: 9%;
-  font-size: 120%;
-  background-color: white;
-  text-align:right;
+ul.topnav li a:hover:not(.active) {
+  background-color: #3bb1d1;
+  color:white;
+  padding: 14px 16px;
+}
 
+ul.topnav li.right {float: right;}
+
+@media screen and (max-width: 600px){
+    ul.topnav li.right, 
+    ul.topnav li {float: none;}
 }
 
-.label-bar a {
-  color: #6D5847;
+/**/
+.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;
+}
+
+.row {
+  width: 100%;
+  margin: auto;
+  align-content: center;
+  
+}
+
+@font-face {
+   font-family: aaragh;
+   src: url("../font/Aaargh.ttf");
+
 }
 
-.login {
 
+#r1_c1
+{
+  font-family:  "Bitstream Vera Sans", Helvetica;
+  font-size: 30px;
+  background-image: url("../img/hd_bg.png");
+  background-repeat: no-repeat;
+  background-position: bottom;
+  padding-top: 15px;
+  padding-bottom: 15px;
+  padding-left: 10%;
 }
 
-#first-right {
-  background-color: white;
-  width:90%;
+
+.rslides {
+  position: relative;
+  list-style: none;
+  overflow: hidden;
+  padding: 0;
+  margin: 0;
+  width: 10px;
+  }
+
+.rslides li {
+  -webkit-backface-visibility: hidden;
+  position: absolute;
+  display: none;
+  left: 0;
+  top: 0;
+  }
+
+.rslides li:first-child {
+  position: relative;
+  display: block;
+  float: left;
+  }
+
+.rslides img {
+  display: block;
+  float: left;
+  border: 0;
+  width: 100%;
+  }
+
+#r2_c1 {
   margin: auto;
-  padding: 5%;
+  width: 100%;
+}
+
+#r2_c2 {
+  padding-top: 15px;
+  width: 100%;
+}
+
+#r3 {
+  text-align: center;
+  color: white;
+  background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
+  padding-bottom: 25px;
+  margin-top: 15px; 
+}
+
+
+
+#r5 {
+  width: 100%;
+}
+
+#r5_c1 {
   text-align: center;
+  font-size: 2vw;
+  font-family: aaragh; 
+  margin-top: 10px;
+
 }
 
-#rectbox {
-    border-radius: 15px 15px 15px 15px;
-    background: #6D5847;
-    margin-left: 15%;
-    margin-top: 3%;
-    width: 75%;
-    height: 60%;
-    padding-top: 8%;
-    padding-bottom: 8%; 
+#r5_c2 {
+  font-family: aaragh; 
+  
+}
 
+#r5_c3 {
+  padding-top: 15px;
 }
 
+#r6 {
+  padding: 35px;
+  margin-top: 15px;
+  width: 100%;
+  background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
+  
+}
 
-/* Icons with their respective Images */
-.icons {
-    background: white;
-    margin-top: 3%;
-    padding-top: 2%;
-    font-size: 15pt;
-    color: #6D5847;
+#r6_c2 {
+  text-align: center;
+  font-family: aaragh;  
+  color: white;
 }
 
-.icons a {
-  color: #6D5847;
+.tslides {
+  position: relative;
+  list-style: none;
+  overflow: hidden;
+  padding: 0;
+  margin: 0;
+  width: 10px;
+  }
+
+.tslides li {
+  -webkit-backface-visibility: hidden;
+  position: absolute;
+  display: none;
+  left: 0;
+  top: 0;
+  text-align: center;
+  }
+
+.tslides li:first-child {
+  position: relative;
+  display: block;
+  text-align: center;
+  }
+
+
+#email {
+    width: 40%;
+    padding: 12px 20px;
+    margin: 8px 0;
+    box-sizing: border-box;
+    border-radius: 5px;
+}
+
+#name {
+    width: 40%;
+    padding: 12px 20px;
+    margin: 8px 0;
+    box-sizing: border-box;
+    border-radius: 5px;
 }
 
-label {
-  color:white !important;
+#msg {
+    width: 75%;
+    padding: 12px 20px;
+    margin: 8px 0;
+    box-sizing: border-box;
+    border-radius: 5px;
 }
 
+#r8 {
+  background: #c8c5b6;
+  margin-top: 15px;
+  padding-right: 20px;
+  padding-left: 20px;
+  width: 100%;
+}
 
-/* Contact Us, Related Links and Organization Logo css*/
 
 
-#bottom a{
-  color: #6D5847;
+#r8_c2 {
+  font-size: 16px;
+  
+  text-align: center;
+  
+}
+
+#social {
+  float: right;
+
+}
+#r8_c4 {
+  text-align: center;
+  font-size: 12px;
+  
+  width: 100%;
+}
+
+hr {
+  background-color: black;
 }
 
 /* Style all font awesome icons */
@@ -152,6 +256,7 @@ label {
 .fa-facebook {
     background: #3B5998;
     color: white;
+
 }
 /* Google */
 .fa-google {
@@ -167,17 +272,3 @@ label {
 #social a{
     color: white;
 }
-
-/* Footer */
-.footer {
-  position: relative;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  
-  background-color: black;
-  text-align: center;
-  color:white;
-}
-
-
diff --git a/workshop_app/static/workshop_app/css/new_index.css b/workshop_app/static/workshop_app/css/new_index.css
new file mode 100644
index 0000000..0f0e8e2
--- /dev/null
+++ b/workshop_app/static/workshop_app/css/new_index.css
@@ -0,0 +1,274 @@
+/* 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 {   
+        width: 100%;
+        padding: 0;
+
+    },
+  
+}
+
+ul.topnav {
+    list-style-type: none;
+    margin: 20px;
+    padding: 0;
+    overflow: hidden;   
+}
+
+ul.topnav li {float: right;}
+
+ul.topnav li a {
+    display: block;
+    color: black;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none;
+}
+
+ul.topnav li a:hover:not(.active) {
+  background-color: #3bb1d1;
+  color:white;
+  padding: 14px 16px;
+}
+
+ul.topnav li.right {float: right;}
+
+@media screen and (max-width: 600px){
+    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;
+}
+
+.row {
+	width: 100%;
+	margin: auto;
+	align-content: center;
+	
+}
+
+@font-face {
+   font-family: aaragh;
+   src: url("../font/Aaargh.ttf");
+
+}
+
+
+#r1_c1
+{
+	font-family:  "Bitstream Vera Sans", Helvetica;
+	font-size: 30px;
+	background-image: url("../img/hd_bg.png");
+	background-repeat: no-repeat;
+  background-position: bottom;
+  padding-top: 15px;
+	padding-bottom: 15px;
+  padding-left: 10%;
+}
+
+
+.rslides {
+  position: relative;
+  list-style: none;
+  overflow: hidden;
+  padding: 0;
+  margin: 0;
+  width: 10px;
+  }
+
+.rslides li {
+  -webkit-backface-visibility: hidden;
+  position: absolute;
+  display: none;
+  left: 0;
+  top: 0;
+  }
+
+.rslides li:first-child {
+  position: relative;
+  display: block;
+  float: left;
+  }
+
+.rslides img {
+  display: block;
+  float: left;
+  border: 0;
+  width: 100%;
+  }
+
+#r2_c1 {
+  margin: auto;
+  width: 100%;
+}
+
+#r2_c2 {
+	padding-top: 15px;
+	width: 100%;
+}
+
+#r3 {
+	text-align: center;
+	color: white;
+	background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
+	padding-bottom: 25px;
+  margin-top: 15px; 
+}
+
+
+
+#r5 {
+	width: 100%;
+}
+
+#r5_c1 {
+	text-align: center;
+	font-size: 2vw;
+	font-family: aaragh; 
+  margin-top: 10px;
+
+}
+
+#r5_c2 {
+	font-family: aaragh; 
+	
+}
+
+#r5_c3 {
+	padding-top: 15px;
+}
+
+#r6 {
+	padding: 35px;
+	margin-top: 15px;
+	width: 100%;
+	background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
+	
+}
+
+#r6_c2 {
+	text-align: center;
+	font-family: aaragh;	
+	color: white;
+}
+
+.tslides {
+  position: relative;
+  list-style: none;
+  overflow: hidden;
+  padding: 0;
+  margin: 0;
+  width: 10px;
+  }
+
+.tslides li {
+  -webkit-backface-visibility: hidden;
+  position: absolute;
+  display: none;
+  left: 0;
+  top: 0;
+  text-align: center;
+  }
+
+.tslides li:first-child {
+  position: relative;
+  display: block;
+  text-align: center;
+  }
+
+
+#email {
+    width: 40%;
+    padding: 12px 20px;
+    margin: 8px 0;
+    box-sizing: border-box;
+    border-radius: 5px;
+}
+
+#name {
+    width: 40%;
+    padding: 12px 20px;
+    margin: 8px 0;
+    box-sizing: border-box;
+    border-radius: 5px;
+}
+
+#msg {
+    width: 75%;
+    padding: 12px 20px;
+    margin: 8px 0;
+    box-sizing: border-box;
+    border-radius: 5px;
+}
+
+#r8 {
+	background: #c8c5b6;
+	margin-top: 15px;
+	padding-right: 20px;
+	padding-left: 20px;
+	width: 100%;
+}
+
+
+
+#r8_c2 {
+	font-size: 16px;
+	
+	text-align: center;
+	
+}
+
+#social {
+	float: right;
+
+}
+#r8_c4 {
+	text-align: center;
+	font-size: 12px;
+	
+	width: 100%;
+}
+
+hr {
+	background-color: black;
+}
+
+/* Style all font awesome icons */
+.fa {
+    padding: 6px;
+    font-size: 30px;
+    width: 30px;
+    text-align: center;
+    text-decoration: none;
+}
+
+/* Add a hover effect if you want */
+.fa:hover {
+    opacity: 0.7;
+}
+
+/* Facebook */
+.fa-facebook {
+    background: #3B5998;
+    color: white;
+
+}
+/* Google */
+.fa-google {
+  background: #dd4b39;
+  color: white;
+}
+/* Youtube */
+.fa-youtube {
+  background: #bb0000;
+  color: white;
+}
+
+#social a{
+    color: white;
+}
diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css
index 7e5ed4c..c0a38e8 100644
--- a/workshop_app/static/workshop_app/css/sticky-footer.css
+++ b/workshop_app/static/workshop_app/css/sticky-footer.css
@@ -1,6 +1,6 @@
 /* Navbar */
 .navbar-custom {
-	background-color:#6D5847;
+	background:  linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 );
     color:black;
   	border-radius:0;
 }
@@ -22,13 +22,13 @@
 .navbar-custom .navbar-nav > .active > a:focus,
 .navbar-custom .navbar-nav > .open >a {
     text-decoration: none;
-    background-color: #fff;
+    background-color: #3bb1d1;
 }
 
 /* Brand-CompanyName */
 .navbar-custom .navbar-brand {
 	color:#efefef;
-  background-color: black;
+  background-color: #2c5aa0;
 }
 
 .navbar-custom .navbar-brand:hover{
diff --git a/workshop_app/static/workshop_app/font/Aaargh.ttf b/workshop_app/static/workshop_app/font/Aaargh.ttf
new file mode 100755
index 0000000..d316fc6
--- /dev/null
+++ b/workshop_app/static/workshop_app/font/Aaargh.ttf
diff --git a/workshop_app/static/workshop_app/js/index.js b/workshop_app/static/workshop_app/js/index.js
new file mode 100644
index 0000000..ddd0f7c
--- /dev/null
+++ b/workshop_app/static/workshop_app/js/index.js
@@ -0,0 +1,8 @@
+/*! http://responsiveslides.com v1.55 by @viljamis */
+(function(c,K,C){c.fn.responsiveSlides=function(m){var a=c.extend({auto:!0,speed:500,timeout:4E3,pager:!1,nav:!1,random:!1,pause:!1,pauseControls:!0,prevText:"Previous",nextText:"Next",maxwidth:"",navContainer:"",manualControls:"",namespace:"rslides",before:c.noop,after:c.noop},m);return this.each(function(){C++;var f=c(this),u,t,v,n,q,r,p=0,e=f.children(),D=e.length,h=parseFloat(a.speed),E=parseFloat(a.timeout),w=parseFloat(a.maxwidth),g=a.namespace,d=g+C,F=g+"_nav "+d+"_nav",x=g+"_here",k=d+"_on",
+y=d+"_s",l=c("<ul class='"+g+"_tabs "+d+"_tabs' />"),z={"float":"left",position:"relative",opacity:1,zIndex:2},A={"float":"none",position:"absolute",opacity:0,zIndex:1},G=function(){var b=(document.body||document.documentElement).style,a="transition";if("string"===typeof b[a])return!0;u=["Moz","Webkit","Khtml","O","ms"];var a=a.charAt(0).toUpperCase()+a.substr(1),c;for(c=0;c<u.length;c++)if("string"===typeof b[u[c]+a])return!0;return!1}(),B=function(b){a.before(b);G?(e.removeClass(k).css(A).eq(b).addClass(k).css(z),
+p=b,setTimeout(function(){a.after(b)},h)):e.stop().fadeOut(h,function(){c(this).removeClass(k).css(A).css("opacity",1)}).eq(b).fadeIn(h,function(){c(this).addClass(k).css(z);a.after(b);p=b})};a.random&&(e.sort(function(){return Math.round(Math.random())-.5}),f.empty().append(e));e.each(function(a){this.id=y+a});f.addClass(g+" "+d);m&&m.maxwidth&&f.css("max-width",w);e.hide().css(A).eq(0).addClass(k).css(z).show();G&&e.show().css({"-webkit-transition":"opacity "+h+"ms ease-in-out","-moz-transition":"opacity "+
+h+"ms ease-in-out","-o-transition":"opacity "+h+"ms ease-in-out",transition:"opacity "+h+"ms ease-in-out"});if(1<e.length){if(E<h+100)return;if(a.pager&&!a.manualControls){var H=[];e.each(function(a){a+=1;H+="<li><a href='#' class='"+y+a+"'>"+a+"</a></li>"});l.append(H);m.navContainer?c(a.navContainer).append(l):f.after(l)}a.manualControls&&(l=c(a.manualControls),l.addClass(g+"_tabs "+d+"_tabs"));(a.pager||a.manualControls)&&l.find("li").each(function(a){c(this).addClass(y+(a+1))});if(a.pager||a.manualControls)r=
+l.find("a"),t=function(a){r.closest("li").removeClass(x).eq(a).addClass(x)};a.auto&&(v=function(){q=setInterval(function(){e.stop(!0,!0);var b=p+1<D?p+1:0;(a.pager||a.manualControls)&&t(b);B(b)},E)},v());n=function(){a.auto&&(clearInterval(q),v())};a.pause&&f.hover(function(){clearInterval(q)},function(){n()});if(a.pager||a.manualControls)r.bind("click",function(b){b.preventDefault();a.pauseControls||n();b=r.index(this);p===b||c("."+k).queue("fx").length||(t(b),B(b))}).eq(0).closest("li").addClass(x),
+a.pauseControls&&r.hover(function(){clearInterval(q)},function(){n()});if(a.nav){g="<a href='#' class='"+F+" prev'>"+a.prevText+"</a><a href='#' class='"+F+" next'>"+a.nextText+"</a>";m.navContainer?c(a.navContainer).append(g):f.after(g);var d=c("."+d+"_nav"),I=d.filter(".prev");d.bind("click",function(b){b.preventDefault();b=c("."+k);if(!b.queue("fx").length){var d=e.index(b);b=d-1;d=d+1<D?p+1:0;B(c(this)[0]===I[0]?b:d);(a.pager||a.manualControls)&&t(c(this)[0]===I[0]?b:d);a.pauseControls||n()}});
+a.pauseControls&&d.hover(function(){clearInterval(q)},function(){n()})}}if("undefined"===typeof document.body.style.maxWidth&&m.maxwidth){var J=function(){f.css("width","100%");f.width()>w&&f.css("width",w)};J();c(K).bind("resize",function(){J()})}})}})(jQuery,this,0);
\ 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 7265889..d53027b 100644
--- a/workshop_app/templates/workshop_app/booking.html
+++ b/workshop_app/templates/workshop_app/booking.html
@@ -93,7 +93,7 @@
 		  <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 }}/view_workshoptype_details/"> Workshop List</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>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html
index e611888..606b5c7 100644
--- a/workshop_app/templates/workshop_app/edit_profile.html
+++ b/workshop_app/templates/workshop_app/edit_profile.html
@@ -27,7 +27,7 @@
             <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 }}/view_workshoptype_details/"> Workshop List</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>
           </ul>
         {% endif %}
diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html
index ad95503..c33609c 100644
--- a/workshop_app/templates/workshop_app/how_to_participate.html
+++ b/workshop_app/templates/workshop_app/how_to_participate.html
@@ -24,7 +24,7 @@
 		  <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 }}/view_workshoptype_details/"> Workshop List</a></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">
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index bd00bad..a5f6b0a 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -1,18 +1,14 @@
 
 <!DOCTYPE html>
-<html lang="en">
-
+<html>
 <head>
-
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="Akshen Doke" content="">
 
-    <title>Welcome</title>
-
-    <!-- Bootstrap Core CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 
     <!-- Custom CSS -->
     <link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/index.css" type="text/css" />
@@ -20,152 +16,153 @@
     <!-- Add icon library -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+
+    <!-- Custom JS -->
+    <script src="{{ URL_ROOT }}/static/workshop_app/js/index.js"></script> 
 
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-        <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->
-<!-- ChatBox CSS -->
 
-  <!-- ChatBot Post -->
-    <script src="{{ URL_ROOT }}/static/workshop_app/js/jquery.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>
+    <title>Welcome</title>
+    
+    <script>
+      $(function() {
+        $(".rslides").responsiveSlides({
+            speed: "3000",
+        });
+      });
+
+      $(function() {
+        $(".tslides").responsiveSlides({
+            speed: "1000",
+        });
+      });
+    </script>
 
+        
 </head>
+<body class="container">
 
-<body>
-    <!-- Navigation -->
-        <div class="row">
-                        <div class="col-12">
-                <center>
-                            <a href="{{URL_ROOT}}/self_workshop" ><img style="width:100%;max-width:900px;max-height:150px" src="{{URL_ROOT}}/static/workshop_app/img/Web_banner.gif" /></a>
-                </center>
-                        </div>
-            </div>
-            <br>      
-        <div class="container">
-				
-
-        <!-- Heading Row -->
-        <div class="row">
-            <div class="col-md-5 fossee-label">
-                FOSSEE <br>Workshops
-
-            </div>
-            <div class="login col-md-7">
-            <div id="first-right">
-               <div class="label-bar">
-               <a href="http://python.fossee.in/about/"
-        target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a onclick="window.open('/statistics/public_stats/'); window.open('http://fossee.in/fossee-stats') " target="_blank" > Past Workshops</a>
-        </div>
-        <br> <br>
-        <img src=" {{ URL_ROOT }}/static/workshop_app/img/img_1.png" ><br>
-        <div id="rectbox">
-            
-            <form method="post">
-                {% csrf_token %}
-                {{ form.as_p }}
-              <button class="btn btn-default btn-sm"   type="submit">Login</button>
-              <a href="{{URL_ROOT}}/forgotpassword/" class="btn btn-default btn-sm" >Forgot Password</a>
-         </form>
-        </div>
+<div class="row" id="r1">
+    <div class="col-md-6" id="r1_c1">
+        FOSSEE Python Workshop
+    </div>
+    <div class="col-md-6">
+        <ul class="topnav">
+          <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
+          <li><a href="{{URL_ROOT}}/login">Login</a></li>
+          <li><a href="{{URL_ROOT}}/register">Sign Up</a></li>
+          <li ><a href="https://python.fossee.in/about">About Us</a></li>
+        </ul>
+    </div>
+</div>
+
+<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" >
+        <img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_2.png" >
+        <img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_3.png" >
+        <img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_4.png" >
+        <img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_5.png" >
+
+    </div>
+
+    <div class="col-md-6" id="r2_c2">
+        <video style="width: 100%;" controls>
+        <source src="https://static.fossee.in/python/1-day-workshop/1_Introduction_to_Python.mp4" type="video/mp4">
+        </video>
+    </div>
+</div>
+
+<div class="row" id="r3">
+    <div class="col-md-4" id="r3_c1"> <br>6000+ <br>Students Trained</div>
+    <div class="col-md-4" id="r3_c2"><br>100+ <br> Colleges
+    </div>
+    <div class="col-md-4" id="r3_c3"><br> 27 hours of <br>Workshop Material</div>
+</div>
+
+
+<div class="row" id="r4">
+    <div class="col-md-4">
+        <br>
+        <a href="{{URL_ROOT}}/view_workshoptype_details/1"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_1.png" style="width: 100%;"></a>
+    </div>
+    <div class="col-md-4">
         <br>
-        <p style="font-size: 15pt;">If not registered yet, <br> please <a href="{{ URL_ROOT}}/register/" >register here.</a></p>
-        <br><br>
+        <a href="{{URL_ROOT}}/view_workshoptype_details/2"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_2.png" style="width: 100%;"></a>
+    </div>
+    <div class="col-md-4">
+        <br>
+        <a href="{{URL_ROOT}}/self_workshop"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_3.png" style="width: 100%;"></a>
+    </div>
+</div>
 
-            </div>
-            </div>
-            <!-- /.col-md-4 -->
+<div class="row" id="r5">
+        <div class="col-md-12" id="r5_c1">FOSSEE Python Workshop <span style="font-size: 3.5vw; color: #3bb1d1;">Advantage</span>
         </div>
-        <!-- /.row -->
+
+        <div class="col-md-6" id="r5_c2"><img src="{{ URL_ROOT}}/static/workshop_app/img/icon_1.png"><br><br>
+        <h5 style="color: #3bb1d1;">Learn Python for Free,</h5> 
+        <h5 style="color: #3bb1d1;">Many exercises/practice problems</h5> <br>
+        <h5 style="color: #3bb1d1;"> Instructor support for your queries during workshop(s)</h5> <br>
+        <h5 style="color: #3bb1d1;">Get e-certificate</h5>
         
+        </div>
 
-        <!-- Call to Action Well -->
-        <div class="row icons" style="align-items: center;">
-
-
-          <div class="text-center">
-            <div class="col-md-3" style="align-items: center;">
-                <a href="{{ URL_ROOT }}/faq/"><img src="{{ URL_ROOT}}/static/workshop_app/img/faq.png"><br><br>
-                FAQ's</a>
-                <br><br>
-            </div>
-            <div class="col-md-3" style="align-items: center;">
-              <a href="{{ URL_ROOT }}/file_view/flowchart" >
-                <img src="{{ URL_ROOT}}/static/workshop_app/img/part.png"><br><br>
-                How to Participate</a>
-                <br><br>
-            </div>
-            <div class="col-md-3">
-            <a href="{{ URL_ROOT }}/benefits/">
-                <img src="{{ URL_ROOT}}/static/workshop_app/img/bnft.png"><br><br>
-                Benefits</a>
-                <br><br>
-            </div>
-            <div class="col-md-3">
-            <a href="{{ URL_ROOT }}/view_workshoptype_details/">
-                <img src="{{ URL_ROOT}}/static/workshop_app/img/list.png"><br><br>
-                Workshops List</a>
-                <br><br>
-            </div>
-            <!-- /.col-lg-12 -->
-          </div>
+        <div class="col-md-6" id="r5_c3"><img src="{{ URL_ROOT}}/static/workshop_app/img/adv_img.png" style="width: 100%;"></div>
+</div>
+
+<div class="row" id="r6">
+    
+    <div class="col-md-12 tslides" id="r6_c2" > 
+        <li>{{ testimonials.0.message }} <br> <br>
+            <span>~ {{testimonials.0.name}} ~<br>
+             {{testimonials.0.institute}} </span></li>
+        <li>{{testimonials.4.message}} <br><br>
+            <span>~ {{testimonials.4.name}} ~ <br>
+            {{testimonials.4.institute}}</span></li>
+        <li>{{testimonials.3.message}} <br><br>
+            <span>~ {{testimonials.3.name}} ~ <br>
+            {{testimonials.3.institute}}</span></li>
+    </div>
 
-        </div>
-        <!-- /.row -->
-
-        <!-- Content Row -->
-        <div class="row" id="bottom">
-            <div class="col-md-4">
-                <br><br>
-                <h4>Organized By:</h4>
-                <img src="{{ URL_ROOT}}/static/workshop_app/img/fossee_logo.png">
-                &nbsp; &nbsp;
-                <img src="{{ URL_ROOT}}/static/workshop_app/img/iitb_logo.png">
-            </div>
-            <!-- /.col-md-4 -->
-            <div class="col-md-4">
-                <br>
-                <h3>Related Links</h3>
-                <a href="http://fossee.in" target="_blank" >fossee.in</a><br>
-                <a href="http://yaksh.fossee.in" target="_blank" >yaksh.fossee.in</a><br>
-                <a href="http://python.fossee.in" target="_blank" >python.fossee.in</a>
-            </div>
-            <!-- /.col-md-4 -->
-            <div class="col-md-4">
-                <h3>Contact Us</h3>
-                FOSSEE, IIT-Bombay<br>
-                Mumbai, India <br> 
-                <div id="social">
+</div>
+
+<div class="row" id="r7">
+
+</div>
+
+<div class="row" id="r8">
+
+    <div class="col-md-4" id="r8_c1" >
+        <br> <br>
+        <img src="{{ URL_ROOT}}/static/workshop_app/img/fossee_logo_iitb.png" >
+    </div>
+    
+    <div class="col-md-4" id="r8_c2" >
+        <br> <br>
+        FOSSEE, 
+        IIT-Bombay <br>Mumbai, India <br>
+        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>  <br>
-                </div>
-                Phone: (+91) 22 2576 4133<br>
-                Email: workshops[at]fossee[dot]in
-                </div>
-            <!-- /.col-md-4 -->
+                <a href="https://www.youtube.com/channel/UCMtt6exSCmZI7JU73S6Wz_A" target="_blank" class="fa fa-youtube"></a> 
         </div>
-        <!-- /.row -->
-
-        <!-- Footer -->
-        <footer>
-            <div class="footer row">
-                <div class="col-lg-12">
-                <img src="" style="height: 40px;" >
-                    <img src="{{ URL_ROOT }}/static/workshop_app/img/cc.png" > &nbsp; &nbsp;
-                    This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License                
-                </div>
-            </div>
-        </footer>
+    </div>
+
+    <div class="col-md-12" id="r8_c4">
+        <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
 
     </div>
-    <!-- /.container -->
-    <!--  -->
+</div>
 
 </body>
-
 </html>
diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html
index 9b90a7b..e3db7ca 100644
--- a/workshop_app/templates/workshop_app/my_workshops.html
+++ b/workshop_app/templates/workshop_app/my_workshops.html
@@ -141,7 +141,7 @@
             <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 }}/view_workshoptype_details/"> Workshop List</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>
           </ul>
         {% endif %}
@@ -415,3 +415,4 @@
 {% endif %}
 
 {% endblock %}
+
diff --git a/workshop_app/templates/workshop_app/new_index.html b/workshop_app/templates/workshop_app/new_index.html
new file mode 100644
index 0000000..f44b82f
--- /dev/null
+++ b/workshop_app/templates/workshop_app/new_index.html
@@ -0,0 +1,167 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="Akshen Doke" content="">
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+
+	<!-- Custom CSS -->
+    <link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/new_index.css" type="text/css" />
+
+    <!-- Add icon library -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+
+    <!-- Custom JS -->
+    <script src="{{ URL_ROOT }}/static/workshop_app/js/new_index.js"></script> 
+
+
+	<title>Welcome</title>
+	
+	<script>
+	  $(function() {
+	    $(".rslides").responsiveSlides({
+	    	speed: "3000",
+	    });
+	  });
+
+	  $(function() {
+	    $(".tslides").responsiveSlides({
+	    	speed: "1000",
+	    });
+	  });
+	</script>
+
+		
+</head>
+<body class="container">
+
+<div class="row" id="r1">
+	<div class="col-md-6" id="r1_c1">
+		FOSSEE Python Workshop
+	</div>
+	<div class="col-md-6">
+		<ul class="topnav">
+		  <li><a href="{{URL_ROOT}}/login">Login</a></li>
+		  <li><a href="{{URL_ROOT}}/register">Sign Up</a></li>
+		  <li ><a href="https://python.fossee.in/about">About Us</a></li>
+		</ul>
+	</div>
+</div>
+
+<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" >
+		<img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_2.png" >
+		<img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_3.png" >
+		<img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_4.png" >
+		<img src="{{ URL_ROOT}}/static/workshop_app/img/intro_img_5.png" >
+
+	</div>
+
+	<div class="col-md-6" id="r2_c2">
+		<video style="width: 100%;" controls>
+		<source src="https://static.fossee.in/python/1-day-workshop/1_Introduction_to_Python.mp4" type="video/mp4">
+		</video>
+	</div>
+</div>
+
+<div class="row" id="r3">
+	<div class="col-md-4" id="r3_c1"> <br>6000+ <br>Students Trained</div>
+	<div class="col-md-4" id="r3_c2"><br>100+ <br> Colleges
+	</div>
+	<div class="col-md-4" id="r3_c3"><br> 27 hours of <br>Workshop Material</div>
+</div>
+
+
+<div class="row" id="r4">
+	<div class="col-md-4">
+		<br>
+		<a href="{{URL_ROOT}}/view_workshoptype_details/5"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_1.png" style="width: 100%;"></a>
+	</div>
+	<div class="col-md-4">
+		<br>
+		<a href="{{URL_ROOT}}/view_workshoptype_details/4"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_2.png" style="width: 100%;"></a>
+	</div>
+	<div class="col-md-4">
+		<br>
+		<a href="{{URL_ROOT}}/self_workshop"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_3.png" style="width: 100%;"></a>
+	</div>
+</div>
+
+<div class="row" id="r5">
+		<div class="col-md-12" id="r5_c1">FOSSEE Python Workshop <span style="font-size: 3.5vw; color: #3bb1d1;">Advantage</span>
+		</div>
+
+		<div class="col-md-6" id="r5_c2"><img src="{{ URL_ROOT}}/static/workshop_app/img/icon_1.png"><br><br>
+		<h5 style="color: #3bb1d1;">Learn Python for Free,</h5> 
+		<h5 style="color: #3bb1d1;">Many exercises/practice problems</h5> <br>
+		<h5 style="color: #3bb1d1;"> Instructor support for your queries during workshop(s)</h5> <br>
+		<h5 style="color: #3bb1d1;">Get e-certificate</h5>
+		
+		</div>
+
+		<div class="col-md-6" id="r5_c3"><img src="{{ URL_ROOT}}/static/workshop_app/img/adv_img.png" style="width: 100%;"></div>
+</div>
+
+<div class="row" id="r6">
+	
+	<div class="col-md-12 tslides" id="r6_c2" > 
+		<li>{{ testimonials.0.message }} <br> <br>
+			<span>~ {{testimonials.0.name}} ~<br>
+			 {{testimonials.0.institute}} </span></li>
+		<li>{{testimonials.4.message}} <br><br>
+			<span>~ {{testimonials.4.name}} ~ <br>
+			{{testimonials.4.institute}}</span></li>
+		<li>{{testimonials.3.message}} <br><br>
+			<span>~ {{testimonials.3.name}} ~ <br>
+			{{testimonials.3.institute}}</span></li>
+	</div>
+
+</div>
+
+<div class="row" id="r7">
+
+</div>
+
+<div class="row" id="r8">
+
+	<div class="col-md-4" id="r8_c1" >
+		<br> <br>
+		<img src="{{ URL_ROOT}}/static/workshop_app/img/fossee_logo_iitb.png" >
+	</div>
+	
+	<div class="col-md-4" id="r8_c2" >
+		<br> <br>
+		FOSSEE, 
+		IIT-Bombay <br>Mumbai, India <br>
+		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> 
+        </div>
+	</div>
+
+	<div class="col-md-12" id="r8_c4">
+		<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
+
+	</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html
index 8553471..569e3fb 100644
--- a/workshop_app/templates/workshop_app/profile_updated.html
+++ b/workshop_app/templates/workshop_app/profile_updated.html
@@ -27,7 +27,7 @@
         <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_details/"> Workshop List</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>
       </ul>
       {% endif %}
diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html
index e483851..a237f46 100644
--- a/workshop_app/templates/workshop_app/propose_workshop.html
+++ b/workshop_app/templates/workshop_app/propose_workshop.html
@@ -42,7 +42,7 @@
        <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 }}/view_workshoptype_details/"> Workshop List</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>
       </ul>
       <ul class="nav navbar-nav navbar-right">
diff --git a/workshop_app/templates/workshop_app/self_workshop.html b/workshop_app/templates/workshop_app/self_workshop.html
index 032023a..6b9e126 100644
--- a/workshop_app/templates/workshop_app/self_workshop.html
+++ b/workshop_app/templates/workshop_app/self_workshop.html
@@ -92,15 +92,12 @@
 
 			<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>
 
-	</div>
+</div>
 <br>
 <br>
-
 {% endblock %}
\ No newline at end of file
diff --git a/workshop_app/templates/workshop_app/view_benefits.html b/workshop_app/templates/workshop_app/view_benefits.html
index cc46e6d..9b2594d 100644
--- a/workshop_app/templates/workshop_app/view_benefits.html
+++ b/workshop_app/templates/workshop_app/view_benefits.html
@@ -25,7 +25,7 @@
 		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
 		  <li><a href="{{ URL_ROOT }}/faq/">FAQ</a></li>
 		  <li class="active"><a href="{{ URL_ROOT }}/benefits/">Benefits</a>
-		  <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</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>
 		</ul>
diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html
index f07a3e6..6efe66b 100644
--- a/workshop_app/templates/workshop_app/view_faq.html
+++ b/workshop_app/templates/workshop_app/view_faq.html
@@ -26,7 +26,7 @@
 		  <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 }}/view_workshoptype_details/"> Workshop List</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>
 		</ul>
 		<ul class="nav navbar-nav navbar-right">
diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html
index f688017..b20724f 100644
--- a/workshop_app/templates/workshop_app/view_profile.html
+++ b/workshop_app/templates/workshop_app/view_profile.html
@@ -27,7 +27,7 @@
             <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 }}/view_workshoptype_details/"> Workshop List</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>
           </ul>
         {% endif %}
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html
index fd94647..5ca454a 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_details.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html
@@ -1,191 +1,39 @@
+
 {% extends 'workshop_app/base.html' %}
 
 {% block title %}
-	View Details About Workshops
+	View Workshops Type List
 {% endblock %}
 
-{% block extra %}
-
-	<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> -->
-	    <style>
-	    /* The Modal (background) */
-	    .modal {
-		display: none; /* Hidden by default */
-		position: fixed; /* Stay in place */
-		z-index: 1; /* Sit on top */
-		padding-top: 100px; /* Location of the box */
-		left: 0;
-		top: 0;
-		width: 100%; /* Full width */
-		height: 100%; /* Full height */
-		overflow: auto; /* Enable scroll if needed */
-		background-color: rgb(0,0,0); /* Fallback color */
-		background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
-	    }
-
-	    /* Modal Content */
-	    .modal-content {
-		background-color: #fefefe;
-		margin: auto;
-		padding: 20px;
-		border: 1px solid #888;
-		width: 80%;
-	    }
-
-	    /* The Close Button */
-	    .close {
-		color: #aaaaaa;
-		float: right;
-		font-size: 28px;
-		font-weight: bold;
-	    }
-
-	    .close:hover,
-	    .close:focus {
-		color: #000;
-		text-decoration: none;
-		cursor: pointer;
-	    }
-	    </style>	
-
-  <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 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>
-	</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 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 }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
-		</ul>
-	</div>
- {% else %}
+	<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 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>
 	</ul>
   	</div>
-  	{% endif %}
   </nav>
-  {% endblock %}
-
-{% block content %}
-
-	<div class="container">
-		
-		<table class="table table-hover">
-		  <thead>
-		    <tr>
-		      <th>id</th>
-		      <th>Workshop Name</th>
-		      <th>Workshop Duration</th>
-		    </tr>
-		  </thead>
+{% endblock %}
 
-		{% for w in workshoptype %}
-		  <tbody>
-		    <tr  >
-		      <td scope="row" id="{{ forloop.counter }}">{{ forloop.counter }}</td>
-		      <td>{{ w.workshoptype_name }}</td>
-		      <td>{{ w.workshoptype_duration }}</td>
-		      <td><a href="{{URL_ROOT}}/file_view/{{ w.id }}" class="btn btn-default btn-sm" class="accordion-toggle" >View Workshop Details</a></td>
-		      
-		    </tr>
-		  </tbody>
-		 {% endfor %}
-		</table>
-		<a style="color: white;" href="{{ URL_ROOT }}/book/"><button class="btn btn-primary btn-lg" style="float: right;">Start Booking Now</button></a>
-<button id="mailBtn" class="btn btn-info btn-lg">Share Details</button>
-	</div>
+{% block extra %}
 
-	    <!-- The Modal -->
-	    <div id="mailModal" class="modal">
+	<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> -->
 
-	    <!-- Modal content -->
-	    <div class="modal-content">
-		<span class="close">&times;</span>
-		<p>Separate Multiple Email Id's using <strong> comma (,)</strong></p>
-		<form action="{{URL_ROOT}}/share_details/" method="POST">
-		  {% csrf_token %}
-		    <label > Email: </label>
-		    <input name="email" type='email' multiple>
-		    <input type='submit'>
-		</form>
-	    </div>
-	    </div>
+  <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 %}
 
-<!-- Page Navigation -->
+{% block content %}
 	<div class="container">
-		
-		<div class="Page-Nav" align="center">
-		<nav aria-label="Page navigation">
-		 	<ul class="pagination pagination-sm">
-			  	<li class="page-item">
-			      {% if workshoptype.has_previous %}
-					<a class="page-link" tabindex="-1" 
-							href="?page={{ workshoptype.previous_page_number }}">Previous</a>
-				{% endif %}
-			    </li>
-			    <li class="page-item">
-			    <span class="current">
-				Page {{ workshoptype.number }} of {{ workshoptype.paginator.num_pages }}
-					</span>
-				</li>
-			    <li class="page-item">
-			    {% if workshoptype.has_next %}
-					<a class="page-link" href="?page={{ workshoptype.next_page_number }}">Next
-					</a>	
-				{% endif %}
-			    </li>
-		  	</ul>
-		</nav>
-		</div>
-	</div> <script>
-	    // Get the modal
-	    var modal = document.getElementById("mailModal");
-
-	    // Get the button that opens the modal
-	    var btn = document.getElementById("mailBtn");
-
-	    // Get the <span> element that closes the modal
-	    var span = document.getElementsByClassName("close")[0];
-
-	    // When the user clicks the button, open the modal 
-	    btn.onclick = function() {
-		modal.style.display = "block";
-	    }
+	{{ workshoptype.workshoptype_description | safe }}					
+	</div>
 
-	    // When the user clicks on <span> (x), close the modal
-	    span.onclick = function() {
-		modal.style.display = "none";
-	    }
+{% endblock %}
 
-	    // When the user clicks anywhere outside of the modal, close it
-	    window.onclick = function(event) {
-		if (event.target == modal) {
-		    modal.style.display = "none";
-		}
-	    } 
-      
-    
-  </script>
 
-{% endblock %}
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html
index dfbc5d7..6011a2e 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_list.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html
@@ -1,51 +1,97 @@
-
 {% extends 'workshop_app/base.html' %}
 
 {% block title %}
-	View Workshops Type List
+	View Details About Workshops
 {% endblock %}
 
+{% block extra %}
+
+	<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> -->
+	    <style>
+	    /* The Modal (background) */
+	    .modal {
+		display: none; /* Hidden by default */
+		position: fixed; /* Stay in place */
+		z-index: 1; /* Sit on top */
+		padding-top: 100px; /* Location of the box */
+		left: 0;
+		top: 0;
+		width: 100%; /* Full width */
+		height: 100%; /* Full height */
+		overflow: auto; /* Enable scroll if needed */
+		background-color: rgb(0,0,0); /* Fallback color */
+		background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+	    }
+
+	    /* Modal Content */
+	    .modal-content {
+		background-color: #fefefe;
+		margin: auto;
+		padding: 20px;
+		border: 1px solid #888;
+		width: 80%;
+	    }
+
+	    /* The Close Button */
+	    .close {
+		color: #aaaaaa;
+		float: right;
+		font-size: 28px;
+		font-weight: bold;
+	    }
+
+	    .close:hover,
+	    .close:focus {
+		color: #000;
+		text-decoration: none;
+		cursor: pointer;
+	    }
+	    </style>	
+
+  <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 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>
+ <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>
+	</div>
 		<ul class="nav navbar-nav">
-		{% if request.user.profile.position == 'instructor'%}
-		  <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li>
-		  <li><a href="{{ URL_ROOT }}/statistics/">Workshop Stats</a></li>
-		  <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</a></li>
-		{% else %}
-		  <li><a href="{{ URL_ROOT }}/book/">Book</a></li>
+		  <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li>
 		  <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li>
-		{% endif %}
-		  <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 }}/faq/">FAQ's</a></li>
+		  <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a>
+		  <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 }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
 		</ul>
-	  	</div>
-	</nav>
-{% endblock %}
-
-{% block extra %}
-
-	<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.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>
-{% endblock %}
+	</div>
+ {% else %}
+  <div class="container-fluid">
+	<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 }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile</a></li>
+	  <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li>
+	</ul>
+  	</div>
+  	{% endif %}
+  </nav>
+  {% endblock %}
 
 {% block content %}
 
 	<div class="container">
 		
-		<table class="table table-hover" >
+		<table class="table table-hover">
 		  <thead>
 		    <tr>
 		      <th>id</th>
@@ -56,21 +102,36 @@
 
 		{% for w in workshoptype %}
 		  <tbody>
-		    <tr>
+		    <tr  >
 		      <td scope="row" id="{{ forloop.counter }}">{{ forloop.counter }}</td>
 		      <td>{{ w.workshoptype_name }}</td>
 		      <td>{{ w.workshoptype_duration }}</td>
-		      <td><a class="btn btn-default btn-sm" href="{{URL_ROOT}}/file_view/{{ w.id }}">View Workshop Details</a></td>
-		      {% if request.user.profile.position == 'coordinator' %}
+		      <td><a href="{{URL_ROOT}}/view_workshoptype_details/{{ w.id }}" class="btn btn-default btn-sm" class="accordion-toggle" >View Workshop Details</a></td>
 		      
-		      {% endif %}
 		    </tr>
 		  </tbody>
 		 {% endfor %}
 		</table>
-		
+		<a style="color: white;" href="{{ URL_ROOT }}/book/"><button class="btn btn-primary btn-lg" style="float: right;">Start Booking Now</button></a>
+<button id="mailBtn" class="btn btn-info btn-lg">Share Details</button>
 	</div>
 
+	    <!-- The Modal -->
+	    <div id="mailModal" class="modal">
+
+	    <!-- Modal content -->
+	    <div class="modal-content">
+		<span class="close">&times;</span>
+		<p>Separate Multiple Email Id's using <strong> comma (,)</strong></p>
+		<form action="{{URL_ROOT}}/share_details/" method="POST">
+		  {% csrf_token %}
+		    <label > Email: </label>
+		    <input name="email" type='email' multiple>
+		    <input type='submit'>
+		</form>
+	    </div>
+	    </div>
+
 <!-- Page Navigation -->
 	<div class="container">
 		
@@ -97,5 +158,34 @@
 		  	</ul>
 		</nav>
 		</div>
-	</div>
+	</div> <script>
+	    // Get the modal
+	    var modal = document.getElementById("mailModal");
+
+	    // Get the button that opens the modal
+	    var btn = document.getElementById("mailBtn");
+
+	    // Get the <span> element that closes the modal
+	    var span = document.getElementsByClassName("close")[0];
+
+	    // When the user clicks the button, open the modal 
+	    btn.onclick = function() {
+		modal.style.display = "block";
+	    }
+
+	    // When the user clicks on <span> (x), close the modal
+	    span.onclick = function() {
+		modal.style.display = "none";
+	    }
+
+	    // When the user clicks anywhere outside of the modal, close it
+	    window.onclick = function(event) {
+		if (event.target == modal) {
+		    modal.style.display = "none";
+		}
+	    } 
+      
+    
+  </script>
+
 {% endblock %}
diff --git a/workshop_app/templates/workshop_app/workshop_stats.html b/workshop_app/templates/workshop_app/workshop_stats.html
index 78832ec..18f5f6e 100644
--- a/workshop_app/templates/workshop_app/workshop_stats.html
+++ b/workshop_app/templates/workshop_app/workshop_stats.html
@@ -325,7 +325,7 @@
 						{{ india_map | safe }}
 						);
 
-			                    var opts = {
+			            var opts = {
 					    region: 'IN',
 					    domain: 'IN',
 					    displayMode: 'regions',
diff --git a/workshop_app/tests/test_views.py b/workshop_app/tests/test_views.py
index 2577b91..e70a531 100644
--- a/workshop_app/tests/test_views.py
+++ b/workshop_app/tests/test_views.py
@@ -307,8 +307,8 @@ class TestStaticPages(TestCase):
 		response = self.client.get('/file_view/flowchart')
 		self.assertEqual(response.status_code, 200)
 
-	def test_view_workshoptype_details(self):
-		response = self.client.get('/view_workshoptype_details/')
+	def test_view_workshoptype_list(self):
+		response = self.client.get('/view_workshoptype_list/')
 		self.assertEqual(response.status_code, 200)
 
 
diff --git a/workshop_app/urls.py b/workshop_app/urls.py
index ec97f00..8123dea 100644
--- a/workshop_app/urls.py
+++ b/workshop_app/urls.py
@@ -40,7 +40,7 @@ urlpatterns = [
     url(r'^faq/$', views.faq),
     url(r'^manage/$', views.manage),
     url(r'^view_workshoptype_list/$', views.view_workshoptype_list),
-    url(r'^view_workshoptype_details/$', views.view_workshoptype_details),
+    url(r'^view_workshoptype_details/([1-9][0-9]*)$', views.view_workshoptype_details),
     url(r'^create_workshop/$', views.create_workshop),
     url(r'^propose_workshop/$', views.propose_workshop),
     url(r'^workshop_stats/$', views.workshop_stats),
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 2e6a8fd..051f447 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -62,6 +62,7 @@ def index(request):
 
     user = request.user
     form = UserLoginForm()
+    testimonials = Testimonial.objects.all()
     if user.is_authenticated() and is_email_checked(user):
         if user.groups.filter(name='instructor').count() > 0:
             return redirect('/manage/')
@@ -77,7 +78,8 @@ def index(request):
                 return redirect('/manage/')
             return redirect('/book/')
 
-    return render(request, "workshop_app/index.html", {"form": form})
+    return render(request, "workshop_app/index.html", {"form": form,
+        "testimonials": testimonials })
 
 
 def is_instructor(user):
@@ -867,36 +869,20 @@ def create_workshop(request):
         return redirect('/book/')
 
 
-@login_required
-def view_workshoptype_list(request):
+def view_workshoptype_details(request, workshoptype_id):
     '''Gives the types of workshop details '''
     user = request.user
     if is_superuser(user):
         return redirect("/admin")
-    if is_email_checked(user):
-        workshoptype_list = WorkshopType.objects.all()
 
-        paginator = Paginator(workshoptype_list, 12) #Show upto 12 workshops per page
-
-        page = request.GET.get('page')
-        try:
-            workshoptype = paginator.page(page)
-        except PageNotAnInteger:
-            #If page is not an integer, deliver first page.
-            workshoptype = paginator.page(1)
-        except EmptyPage:
-            #If page is out of range(e.g 999999), deliver last page.
-            workshoptype = paginator.page(paginator.num_pages)
-
-        return render(
-                request, 'workshop_app/view_workshoptype_list.html', \
-                {'workshoptype': workshoptype}
-                )
-    else:
-        return redirect('/activate_user/')
+    view_workshoptype_details = WorkshopType.objects.get(id=workshoptype_id)
 
+    return render(
+            request, 'workshop_app/view_workshoptype_details.html', \
+            {'workshoptype': view_workshoptype_details}
+            )
 
-def view_workshoptype_details(request):
+def view_workshoptype_list(request):
     '''Gives the details for types of workshops.'''
     user = request.user
     if is_superuser(user):
@@ -917,7 +903,7 @@ def view_workshoptype_details(request):
         workshoptype = paginator.page(paginator.num_pages)
 
     return render(
-            request, 'workshop_app/view_workshoptype_details.html', \
+            request, 'workshop_app/view_workshoptype_list.html', \
                 {'workshoptype': workshoptype}
                 )
 
@@ -1225,7 +1211,7 @@ def share_details(request):
         if request.method == 'POST':
             email_list = (request.POST.get('email').split(','))
             send_email(request, call_on='ShareMail', other_email=email_list)
-        return redirect('/view_workshoptype_details/')
+        return redirect('/view_workshoptype_list/')
 
 
 def self_workshop(request):