diff --git a/build/beekee-v0.1-arm-v6.tar.gz b/build/beekee-v0.1-arm-v6.tar.gz
deleted file mode 100644
index 33f3fa9..0000000
Binary files a/build/beekee-v0.1-arm-v6.tar.gz and /dev/null differ
diff --git a/build/beekee-v0.1-arm-v7.tar.gz b/build/beekee-v0.1-arm-v7.tar.gz
deleted file mode 100644
index 33b2bc0..0000000
Binary files a/build/beekee-v0.1-arm-v7.tar.gz and /dev/null differ
diff --git a/src/.meteor/packages b/src/.meteor/packages
index 667e8f9..00e15f3 100644
--- a/src/.meteor/packages
+++ b/src/.meteor/packages
@@ -57,3 +57,4 @@ teamon:tinymce
 tomi:upload-jquery@=2.2.3
 tomi:upload-server
 chrismbeckett:toastr
+reywood:iron-router-ga
diff --git a/src/.meteor/versions b/src/.meteor/versions
index f16869f..2134a32 100644
--- a/src/.meteor/versions
+++ b/src/.meteor/versions
@@ -96,6 +96,7 @@ reactive-dict@1.1.3
 reactive-var@1.0.6
 reload@1.1.4
 retry@1.0.4
+reywood:iron-router-ga@0.7.1
 routepolicy@1.0.6
 ryanswapp:fabricjs@0.1.1
 rzymek:moment-locale-fr@2.9.0
diff --git a/src/client/stylesheets/custom.css b/src/client/stylesheets/custom.css
index 5a73589..8cfc14f 100644
--- a/src/client/stylesheets/custom.css
+++ b/src/client/stylesheets/custom.css
@@ -3,6 +3,19 @@ custom.css
 */
 
 
+/* ----- Fonts ----- */
+
+@font-face {
+  font-family: 'Raleway Regular';
+  src: url('/fonts/Raleway-Regular.eot'); /* IE9 Compat Modes */
+  src: url('/fonts/Raleway-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/fonts/Raleway-Regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('/fonts/Raleway-Regular.woff') format('woff'), /* Pretty Modern Browsers */
+       url('/fonts/Raleway-Regular.ttf')  format('truetype'), /* Safari, Android, iOS */
+       url('/fonts/Raleway-Regular.svg#svgFontName') format('svg'); /* Legacy iOS */
+}
+
+
 /* ----- Global ----- */
 
 html {
@@ -11,6 +24,7 @@ html {
 
 body {
 	background-color: #fafafa;
+	font-family: Raleway, 'Raleway Regular', sans-serif;
 	overflow: auto;
 	height: 100% !important;
 }
@@ -19,13 +33,47 @@ a, button {
   outline: none;
 }
 
+a {
+	color: #1da1f2;
+}
+
+a.link-white {
+	color:white;
+	text-decoration: underline;
+	font-weight: bold;
+}
+
+a.link-white:hover {
+	color:#0056b3;
+}
+
+h6 {
+	font-weight: bold;
+}
+
 .wrapper {
 	overflow-y: scroll;
     overflow: -moz-scrollbars-vertical; 
 }
 
 .bg-beekee {
-	background-color: #ffff66;
+	background-color: rgb(66, 164, 224);
+}
+
+.text-primary {
+	color: rgb(66, 164, 224) !important;
+}
+
+.btn-outline-primary {
+	border: solid 2px rgb(66, 164, 224) !important;
+	border-radius: 20px;
+	color: rgb(66, 164, 224) !important;
+}
+
+.btn-outline-primary:hover {
+	background-color: rgb(66, 164, 224) !important;
+	border-color: rgb(66, 164, 224) !important;
+	color: white !important;
 }
 
 .btn-icon {
@@ -72,6 +120,11 @@ a, button {
 	min-height: 100% !important;
 }
 
+.card {
+	border: solid 1px #efefef;
+	box-shadow: 0 30px 10px -32px rgba(50,50,93,.08), 0 18px 36px -18px rgba(0,0,0,.05), 0 -12px 36px -8px rgba(0,0,0,.0015);
+}
+
 .card-header {
 	padding: 0.5rem 1.25rem !important;
 	font-weight: 500 !important;
@@ -102,6 +155,15 @@ a, button {
 
 }
 
+@media (max-width: 991.98px) { 
+	.row {
+/*		margin-left:0px;
+		margin-right:0px;
+				padding-left:0px;
+		padding-right:0px;*/
+	}
+}
+
 input.error {
  	background-color:rgb(255, 231, 231);
  }
@@ -128,20 +190,12 @@ and (max-device-width : 568px) {*/
 }
 
 
-/* ----- Sidebar ----- */
-
-.space-sidebar--menu-collapse[aria-expanded="false"] .fa:before {  
-  content: "\f0d8";
-}
+/* ----- Index Student ----- */
 
-.space-sidebar--menu-collapse[aria-expanded="true"] .fa:before {
-  content: "\f0d7";
+.index-student {
+	background-color: #1da1f2;
 }
 
-.space-sidebar--filter-category > :nth-child(3) { display:none; }
-
-.space-sidebar--filter-category:hover > :nth-child(3) { display:inline; }
-
 
 /* ----- Post item ----- */
 
@@ -182,6 +236,20 @@ and (max-device-width : 568px) {*/
 }
 
 
+/* ----- Live Feed Post Submit ----- */
+
+.live-feed-post-submit {
+	border:solid 1px rgb(204, 232, 255);
+	padding:10px;
+	border-radius: 0.25rem 0.25rem 0.25rem 0.25rem !important;
+	background:#f2f9ff;
+}
+
+#live-feed-post-submit--form .card-img-top {
+	width:50%;
+}
+
+
 /* ----- File upload ----- */
 
 .file-upload--input-file {
@@ -190,6 +258,7 @@ and (max-device-width : 568px) {*/
 }
 
 .file-upload--input-file-icon {
+	color: rgb(66, 164, 224);
 	cursor: pointer;
 }
 
diff --git a/src/client/stylesheets/sidebar.css b/src/client/stylesheets/sidebar.css
index ceb8732..647af33 100644
--- a/src/client/stylesheets/sidebar.css
+++ b/src/client/stylesheets/sidebar.css
@@ -20,12 +20,47 @@ sidebar.css
 /*    box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.2); */
 }
 
+.sidebar-item {
+    padding-left:6px;
+}
+
 .sidebar-item:hover {
-    background-color: white;
+    background-color: rgb(233, 247, 255);
+    border-radius: 15px;
 }
 
-.menu-item--selected {
-    background-color: white;
+.sidebar-item:hover > a{
+    color:rgb(66, 164, 224) !important;
+    font-weight: bold !important;
+}
+
+a.menu-item {
+    color: #676767;
+}
+
+.sidebar--submenu {
+    border-left:solid 1px #cce8ff;
+    margin-left:15px;
+    padding-left:4px;
+}
+
+a.space-sidebar--menu-collapse {
+    color: #afafaf !important;
+    font-weight: bold;
+}
+
+.sidebar--submenu a, .sidebar--submenu i {
+    font-size:0.75em;
+    color: #727980;
+}
+
+a.menu-item--selected {
+    color: rgb(66, 164, 224);
+    font-weight: bold;
+}
+
+.menu-item--selected .menu-item {
+    color: rgb(66, 164, 224);
 }
 
 @media (max-width: 991.98px) { 
@@ -33,8 +68,13 @@ sidebar.css
         background-color: #cccccc;
     }
 
+    .sidebar-item {
+        width:100%;
+    }
+
     .sidebar-item:hover {
-    background-color: #cccccc;
+        border-radius:0px;
+        background-color: #cccccc;
     }
 }
 
@@ -88,6 +128,33 @@ sidebar.css
     transform: translateY(-50%);
 }
 
+.space-sidebar--menu-collapse[aria-expanded="false"] .fa:before {  
+    content: "\f0d7";
+}
+
+.space-sidebar--menu-collapse[aria-expanded="true"] .fa:before {
+    content: "\f0d8";
+}
+
+.space-sidebar--filter-category > :nth-child(3) { display:none; }
+
+.space-sidebar--filter-category:hover > :nth-child(3) { display:inline; }
+
+.space-sidebar--live-feed-category-edit i {
+    font-size:1.1em;
+}
+
+.space-sidebar--credits {
+    margin-top:40px;
+    font-size: 0.7em;
+    color: #b7b7b7;
+    padding-top: 12px;
+}
+
+a.sidebar--add {
+    color: #1da1f2;
+}
+
 
 /* ----- Content ----- */
 
diff --git a/src/client/templates/account/reset-password.html b/src/client/templates/account/reset-password.html
index a1aa439..a5f6a0b 100644
--- a/src/client/templates/account/reset-password.html
+++ b/src/client/templates/account/reset-password.html
@@ -1,19 +1,22 @@
 <template name="resetPassword">
     <div class="reset-password">
-        <div class="page-title">{{_ 'reset-password--page-title'}}</div>
-        <form id="login--form" class="login--form">        
-            <div class="login--wrapper">
-                <label><b>{{_ 'reset-password--new-password'}}</b></label><br />
-                <input type="password" name="" class="form-control" id="password" value=""><br />
-            </div> 
-            <div class="login--button-wrapper">
-                <button type="submit" class="button button-primary reset-password--button-submit">{{_ 'reset-password--button-submit'}}</button>
-            </div>   
-        </form>
-        <div class="login--register-link-wrapper">
-            <span>{{_ 'login--register'}}<br /><br />
-                <a href="{{pathFor 'register'}}"> {{_ 'login--register-link'}}</a> !
-            </span>
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-sm-12 col-lg-8 pt-4 pl-4 pr-4 pb-3 text-center">
+                    <h1 class="mb-5">{{_ 'reset-password--page-title'}}</h1>
+                    <div class="text-justify">
+                       <form id="login--form" class="login--form">        
+                            <div class="login--wrapper">
+                                <label><b>{{_ 'reset-password--new-password'}}</b></label><br />
+                                <input type="password" name="" class="form-control" id="password" value=""><br />
+                            </div> 
+                            <div class="login--button-wrapper">
+                                <button type="button" class="btn btn-primary w-100 reset-password--button-submit">{{_ 'reset-password--button-submit'}}</button>
+                            </div>   
+                        </form>                 
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/account/reset-password.js b/src/client/templates/account/reset-password.js
index 9d348ac..2b03874 100644
--- a/src/client/templates/account/reset-password.js
+++ b/src/client/templates/account/reset-password.js
@@ -1,3 +1,10 @@
+Template.resetPassword.onRendered(function () {
+
+    // Enable autofocus
+    $('#password').focus();
+});
+
+
 Template.resetPassword.events({
     
     'submit form': function(e) {
diff --git a/src/client/templates/account/user_settings.html b/src/client/templates/account/user_settings.html
index 7dfac79..63c3455 100644
--- a/src/client/templates/account/user_settings.html
+++ b/src/client/templates/account/user_settings.html
@@ -2,7 +2,7 @@
 	{{> backHeader}}
 	<div class="container h-100">
 		<div class="row justify-content-center min-h-100">
-    		<div class="col-sm-12 col-lg-8 bg-white border-left border-right min-h-100 pt-4 pl-4 pr-4">
+    		<div class="col-sm-12 col-lg-8 min-h-100 pt-4 pl-4 pr-4">
                 <h5 class="text-center mb-5">{{_ 'user-settings--page-title'}}</h5>
                 <div class="list-group w-100">
                 	<a href="#" class="list-group-item list-group-item-action d-flex user-settings--change-password"><span>{{_ 'user-settings--change-password'}}</span><span class="ml-auto"></span></a>
diff --git a/src/client/templates/admin/admin.html b/src/client/templates/admin/admin.html
index 9df77a3..43bff4b 100644
--- a/src/client/templates/admin/admin.html
+++ b/src/client/templates/admin/admin.html
@@ -109,13 +109,6 @@ <h3>{{_ 'admin--page-title'}}</h3>
 				</div>
 			</div>
 		</div>
-		{{#if isBox}}
-			<div class="row justify-content-center mb-4">
-				<div class="col-sm-12 col-lg-8 text-center">
-					<button type="button" class="btn btn-outline-secondary admin--shutdown"><i class="fa fa-power-off"></i><br><span>{{_ 'index-teacher--shutdown'}}</span></button>
-				</div>
-			</div>
-		{{/if}}
 	</div>
 	{{> adminSpaceSubmit}}
 	{{> adminCreateAccount}}
diff --git a/src/client/templates/admin/admin_space_submit.js b/src/client/templates/admin/admin_space_submit.js
index 30e71de..a6efd40 100644
--- a/src/client/templates/admin/admin_space_submit.js
+++ b/src/client/templates/admin/admin_space_submit.js
@@ -5,7 +5,7 @@ Template.adminSpaceSubmit.onRendered(function () {
             "spaceName": {
                 required: true,
                 minlength: 3,
-                maxlength: 20
+                maxlength: 35
             }
         }
     }); 
@@ -20,7 +20,8 @@ Template.adminSpaceSubmit.events({
 		 e.preventDefault();
 
 		var space = {
-			title: $('#spaceName').val().trim()
+			title: $('#spaceName').val().trim(),
+			lang: Session.get('lang')
 		};
 
 		Meteor.call('spaceInsert', space, function(error, result) {
diff --git a/src/client/templates/headers/back_header.html b/src/client/templates/headers/back_header.html
index e8cc70d..028ce89 100644
--- a/src/client/templates/headers/back_header.html
+++ b/src/client/templates/headers/back_header.html
@@ -1,9 +1,9 @@
 <template name="backHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
 				<div class="col-4 col-lg-3" style="">
-					<a href="#" class="btn-link back-header--button-back"><i class="fas fa-chevron-left fa-lg"></i><span> {{_ 'header--back'}}</span></a>
+					<a href="#" class="back-header--button-back"><i class="fas fa-chevron-left fa-lg"></i><span> {{_ 'header--back'}}</span></a>
 				</div>
 				<div class="col-8">
 				</div>
diff --git a/src/client/templates/headers/index_student_header.html b/src/client/templates/headers/index_student_header.html
index 7daa3fc..93dd827 100644
--- a/src/client/templates/headers/index_student_header.html
+++ b/src/client/templates/headers/index_student_header.html
@@ -1,14 +1,14 @@
 <template name="indexStudentHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
 				<div class="col-4 col-lg-3" style="">
                 	<a class="menu-item h-100" href="#">
-						<img style="height: 35px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_header.png">
+						<img style="height: 55px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_black.svg">
 					</a>
 				</div>
 				<div class="col-8 text-right">
-					<a href="{{pathFor 'indexTeacher'}}" class="btn-link">{{_ 'header--admin-access'}}</a>
+					<a href="{{pathFor 'indexTeacher'}}" class="">{{_ 'header--admin-access'}}</a>
 				</div>
 			</div>
 		</div>
diff --git a/src/client/templates/headers/index_teacher_header.html b/src/client/templates/headers/index_teacher_header.html
index bfa1cbb..0d7fa4c 100644
--- a/src/client/templates/headers/index_teacher_header.html
+++ b/src/client/templates/headers/index_teacher_header.html
@@ -1,15 +1,15 @@
 <template name="indexTeacherHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
 				<div class="col-4 col-lg-3" style="">
                 	<a class="menu-item d-none d-sm-none d-lg-inline h-100" data-id="1" href="#">
-						<img style="height: 35px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_header.png">
+						<img style="height: 55px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_black.svg">
 					</a>
 					<span class="d-none d-sm-none d-lg-inline">{{space.title}}</span>
 				</div>
 				<div class="col-8 text-right">
-					<a href="{{pathFor 'userSettings'}}" class="text-white px-3 mr-4">
+					<a href="{{pathFor 'userSettings'}}" class="px-3 mr-4">
 						<i class="fa fa-user fa-fw"></i> 
 						<span>{{adminName}}</span>
 					</a>
diff --git a/src/client/templates/headers/login_header.html b/src/client/templates/headers/login_header.html
index 0c2e558..710cd77 100644
--- a/src/client/templates/headers/login_header.html
+++ b/src/client/templates/headers/login_header.html
@@ -1,9 +1,9 @@
 <template name="loginHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
 				<div class="col-4 col-lg-3" style="">
-					<a href="{{pathFor 'indexStudent'}}" class="btn-link"><i class="fas fa-chevron-left fa-lg"></i><span> Back</span></a>
+					<a href="{{pathFor 'indexStudent'}}"><i class="fas fa-chevron-left fa-lg"></i><span> Back</span></a>
 				</div>
 				<div class="col-8">
 				</div>
diff --git a/src/client/templates/headers/simple_header.html b/src/client/templates/headers/simple_header.html
index 3a94dcd..1896fcb 100644
--- a/src/client/templates/headers/simple_header.html
+++ b/src/client/templates/headers/simple_header.html
@@ -1,5 +1,5 @@
 <template name="simpleHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
 			</div>
diff --git a/src/client/templates/headers/space_header.html b/src/client/templates/headers/space_header.html
index f95c23a..1ef0191 100644
--- a/src/client/templates/headers/space_header.html
+++ b/src/client/templates/headers/space_header.html
@@ -1,31 +1,31 @@
 <template name="spaceHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:52px;line-height:52px;">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
-				<div class="col-4 col-lg-3" style="">
+				<div class="col-4 col-lg-4" style="">
 					<a role="button" id="sidebarCollapse" class="btn-icon d-inline d-lg-none">
                     	<i class="fas fa-bars fa-lg d-inline"></i>
                 	</a>
                 	<a class="menu-item d-none d-sm-none d-lg-inline h-100" data-id="1" href="#">
-						<img style="height: 35px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_header.png">
+						<img style="height: 55px; padding: 0px 10px 5px 0;" alt="logo" src="/img/logo_black.svg">
 					</a>
 					<span class="d-none d-sm-none d-lg-inline">{{space.title}}</span>
 				</div>
-				<div class="col-8 text-right">
+				<div class="col-8 col-lg-7 text-right">
 					{{#if ownSpace}}
-						<a href="{{pathFor 'userSettings'}}" class="text-white px-3 mr-4">
+						<a href="{{pathFor 'userSettings'}}" class="px-3 mr-4">
 							<i class="fa fa-user fa-fw"></i> 
 							<span>{{adminName}}</span>
 						</a>
 					{{else}}
-						<a href="{{pathFor 'spaceUsers' _id=this.space._id}}" class="text-white px-3 mr-4">
+						<a href="{{pathFor 'spaceUsers' _id=this.space._id}}" class="px-3 mr-4">
 							<i class="fa fa-user fa-fw"></i> 
 							<span>{{authorName}}</span>
 						</a>
 					{{/if}}
 					<a class="btn-icon" role="button" id="dropdownMenuLink" data-toggle="dropdown"><i class="fa fa-ellipsis-v fa-lg"></i></a>
 					<div class="dropdown-menu" style="line-height:1.5" aria-labelledby="dropdownMenuLink">
-						<span class="dropdown-item"><i class="fas fa-key"></i> Code : {{space.spaceCode}}</span>
+						<span class="dropdown-item" onclick="event.stopPropagation();"><i class="fas fa-key"></i> Code : {{space.spaceCode}}</span>
 						{{#if ownSpace}}
 							<a class="dropdown-item" href="{{pathFor 'settings' _id=this.space._id}}"><i class="fas fa-cog"></i> {{_ 'space-header--settings'}}</a>
 							<div class="dropdown-divider"></div>
diff --git a/src/client/templates/headers/users_header.html b/src/client/templates/headers/users_header.html
index 976346b..adb0ada 100644
--- a/src/client/templates/headers/users_header.html
+++ b/src/client/templates/headers/users_header.html
@@ -1,10 +1,10 @@
 <template name="usersHeader">	
-	<nav class="bg-dark text-white" style="z-index:500;height:45px">
+	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
-			<div class="row justify-content-center">
+			<div class="row justify-content-center h-100">
 				<div class="col-6" style="">
-					<a class="navbar-brand menu-item" data-id="1" href="#">
-						<img alt="logo" height="28" src="/img/logo_header.png">
+					<a class="menu-item h-100" href="#">
+						<img alt="logo" style="height: 55px; padding: 0px 10px 5px 0;" src="/img/logo_black.svg">
 					</a>
 					<span>{{space.title}}</span>
 				</div>
diff --git a/src/client/templates/index/index_student.html b/src/client/templates/index/index_student.html
index 8367531..bc63d02 100644
--- a/src/client/templates/index/index_student.html
+++ b/src/client/templates/index/index_student.html
@@ -1,62 +1,71 @@
 <template name="indexStudent">
-	{{> indexStudentHeader}}
-	<div class="container">
-		<div class="row justify-content-center mt-5">
-			<div class=""><img src="/img/logo.png" /></div>
-  		</div>
-  		{{#if isBox}}
-	  		{{#if publicSpaces.count}}
-				<div class="row justify-content-center mt-5 mb-5 text-center">
-		  			<div class="col-12 col-lg-5 text-center">
-						<div class="">
-					 		<h5>{{_ 'index-student--public-spaces-title'}}</h5>
-					 		<div class="list-group w-100">
-					 			{{#each publicSpaces}}
-									<a href="{{pathFor 'space' _id=this._id}}" class="list-group-item list-group-item-action d-flex"><span>{{title}}</span></a>
-								{{/each}}
+	<div class="index-student w-100 h-100 text-white">
+		{{> indexStudentHeader}}
+		<div class="container">
+			<div class="row justify-content-center text-center text-white" style="margin-top:100px">
+				<div class="col-lg-5">
+				<h3>{{_ 'index-student--title'}}</h3></div>
+	  		</div>
+	  		{{#if isBox}}
+		  		{{#if publicSpaces.count}}
+					<div class="row justify-content-center mt-5 mb-5 text-center">
+			  			<div class="col-12 col-lg-5 text-center">
+							<div class="">
+						 		<h5>{{_ 'index-student--public-spaces-title'}}</h5>
+						 		<div class="list-group w-100">
+						 			{{#each publicSpaces}}
+										<a href="{{pathFor 'space' _id=this._id}}" class="list-group-item list-group-item-action d-flex"><span>{{title}}</span></a>
+									{{/each}}
+								</div>
 							</div>
 						</div>
 					</div>
-				</div>
+				{{/if}}
 			{{/if}}
-		{{/if}}
-  		<div class="row justify-content-center mt-5 text-center">
-  			<div class="col-12 col-lg-5">
-  				<h5>{{_ 'index-student--code'}}</h5>
-				<div class="card">
-					<div class="card-body">
-						<form id="index-student--code-link-form" name="index-student--code-link-form">
-	 						<div class="form-group">
-	    						<input type="text" class="form-control" id="code" aria-describedby="emailHelp" placeholder="{{_ 'index-student--code-input-placeholder'}}">
-	  						</div>
-	  	    	  			<a href="#" role="button" class="btn btn-primary w-100 index-student--button-code-link">{{_ 'index-student--button-code-link'}}</a>
-						</form>
+	  		<div class="row justify-content-center mt-5 text-center">
+	  			<div class="col-12 col-lg-5">
+					<div class="card">
+						<div class="card-body">
+							<form id="index-student--code-link-form" name="index-student--code-link-form">
+		 						<div class="form-group">
+		    						<input type="text" class="form-control text-center" id="code" aria-describedby="emailHelp" placeholder="{{_ 'index-student--code-input-placeholder'}}">
+		  						</div>
+		  	    	  			<a href="#" role="button" class="btn btn-primary w-100 index-student--button-code-link">{{_ 'index-student--button-code-link'}}</a>
+							</form>
+						</div>
 					</div>
 				</div>
-			</div>
-  		</div>
-		{{#if spacesVisited.count}}
-	  		<div class="row justify-content-center mt-5 text-center">
-	  			<div class="col-12 col-lg-5 text-center">
-					<div class="index-student--visited-spaces">
-				 		<h5>{{_ 'index-student--visited-title'}}</h5>
-				 		<a href="#" class="small index-student--delete-recent">{{_ 'index-student--delete-recent'}}</a>
-				 		<div class="list-group w-100">
-				 			{{#each spacesVisited}}
-								<a href="{{pathFor 'space' _id=this._id}}" class="list-group-item list-group-item-action d-flex"><span>{{title}}</span><span class="ml-auto">{{spaceCode}}</span></a>
-							{{/each}}
+	  		</div>
+			{{#if spacesVisited.count}}
+		  		<div class="row justify-content-center mt-5 text-center">
+		  			<div class="col-12 col-lg-5 text-center">
+						<div class="index-student--visited-spaces">
+					 		<h5>{{_ 'index-student--visited-title'}}</h5>
+					 		<a href="#" class="small index-student--delete-recent">{{_ 'index-student--delete-recent'}}</a>
+					 		<div class="list-group w-100">
+					 			{{#each spacesVisited}}
+									<a href="{{pathFor 'space' _id=this._id}}" class="list-group-item list-group-item-action d-flex"><span>{{title}}</span><span class="ml-auto">{{spaceCode}}</span></a>
+								{{/each}}
+							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-		{{/if}}
-		<div class="row justify-content-center mt-5">
-			<div class="col-5 col-lg-2 text-center">
-				<select id="langSelect" class="custom-select custom-select-sm border-0" style="width:auto; background-color: #fafafa;">
-				  <option value="en" {{langIsSelected 'en'}}>English</option>
-				  <option value="fr-FR" {{langIsSelected 'fr-FR'}}>Français</option>
-				</select>
-			</div>
-  		</div>
+			{{/if}}
+			<div class="row justify-content-center mt-5">
+				<div class="col-5 col-lg-2 text-center">
+					<select id="langSelect" class="custom-select custom-select-sm border-0" style="width:auto; background-color: #fafafa;">
+					  <option value="en" {{langIsSelected 'en'}}>English</option>
+					  <option value="fr-FR" {{langIsSelected 'fr-FR'}}>Français</option>
+					</select>
+				</div>
+	  		</div>
+	  		<div class="row justify-content-center text-center text-white" style="margin-top:70px">
+				<div class="col-lg-5">
+				<p><a href="{{pathFor 'indexTeacher'}}" class="link-white">{{_ 'index-student--create-your-space-1'}}</a>{{_ 'index-student--create-your-space-2'}}</p></div>
+	  		</div>
+		</div>
+		<div class="text-center mt-3" style="color:#e0e0e0;">
+			<p><a href="{{pathFor 'privacy' _id=this._id}}" class="link-white" style="font-weight:normal;text-decoration: none;">{{_ 'index-student--privacy'}}</a> | <a href="https://www.beekee.ch" class="link-white" style="font-weight:normal;text-decoration: none;">{{_ 'index-student--about-us'}}</a></p>
+		</div>
 	</div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/index/index_teacher.html b/src/client/templates/index/index_teacher.html
index ed0d1d3..c5f906e 100644
--- a/src/client/templates/index/index_teacher.html
+++ b/src/client/templates/index/index_teacher.html
@@ -1,9 +1,6 @@
 <template name="indexTeacher">
 	{{> indexTeacherHeader}}
 	<div class="container">
-		<div class="row justify-content-center mt-5">
-			<div class=""><img src="/img/logo.png" /></div>
-  		</div>
   		<div class="row justify-content-center mt-5">
   			<div class="col-12 col-lg-5 text-center">
 				<h5 class="mb-3">{{_ 'index-teacher--spaces-title'}}</h5>
@@ -56,4 +53,7 @@ <h5 class="mb-3">{{_ 'index-student--public-spaces-title'}}</h5>
   		</div>
 	</div>
 	{{> spaceSubmit}}
+	<div class="text-center mt-3" style="color:#e0e0e0;">
+		<p><a href="{{pathFor 'privacy' _id=this._id}}" style="font-weight:normal;text-decoration: none;">{{_ 'index-student--privacy'}}</a> | <a href="https://www.beekee.ch" style="font-weight:normal;text-decoration: none;">{{_ 'index-student--about-us'}}</a></p>
+	</div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/misc/file_upload.html b/src/client/templates/misc/file_upload.html
index 73d85aa..50ad6ad 100644
--- a/src/client/templates/misc/file_upload.html
+++ b/src/client/templates/misc/file_upload.html
@@ -1,5 +1,5 @@
 <template name="fileUpload">
-	<form method="POST" enctype="multipart/form-data">
+	<form method="POST" enctype="multipart/form-data" style="padding-left:15px">
 		{{#unless infoLabel}}
 			<label class="">
 				<input type="file" accept="image/*" class="file-upload--input-file jqUploadclass" data-form-data='{{ submitData }}'>
diff --git a/src/client/templates/misc/privacy.html b/src/client/templates/misc/privacy.html
index 24e6d20..b04db9e 100644
--- a/src/client/templates/misc/privacy.html
+++ b/src/client/templates/misc/privacy.html
@@ -1,6 +1,15 @@
 <template name="privacy">
 	<div class="privacy">
-		<div class="page-title">{{_ 'privacy--page-title'}}</div>
-		{{{_ 'privacy--content'}}}
+		{{> backHeader}}
+		<div class="container">
+			<div class="row justify-content-center">
+    			<div class="col-sm-12 col-lg-8 pt-4 pl-4 pr-4 pb-3 text-center">
+    				<h1 class="mb-5">{{_ 'privacy--page-title'}}</h1>
+    				<div class="text-justify">
+						{{{_ 'privacy--content'}}}
+					</div>
+    			</div>
+    		</div>
+    	</div>
 	</div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/space/home/home.html b/src/client/templates/space/home/home.html
index 725e697..ca6263f 100644
--- a/src/client/templates/space/home/home.html
+++ b/src/client/templates/space/home/home.html
@@ -1,12 +1,14 @@
 <template name="home">
 	{{#if ownSpace}}
+		{{#if homePostsEmpty}}
 		<div class="float-right">
 			<a href="#" class="home--submit">
 				<i class="fas fa-plus"></i> {{_ 'home--submit-button'}}
 			</a>
 		</div>
+		{{/if}}
 	{{/if}}
-	<h5 class="mb-4">{{_ 'home--title'}}</h5>
+<!-- 	<h5 class="mb-4">{{_ 'home-2-title'}}</h5>-->
 	{{#unless space.permissions.public}}
 		{{#if ownSpace}}
 			{{#if codePanel}}
@@ -24,4 +26,24 @@ <h5 class="mb-4">{{_ 'home--title'}}</h5>
 	{{> homePostSubmit}}
 	{{> homePostEdit}}
 	{{> homePostDelete}}
+	{{#if liveFeedAddPost}}
+		{{> liveFeedPostSubmit}}
+	{{/if}}
+		{{#if newMessages}}
+			<div class="text-center mb-2">
+				<button type="button" class="btn btn-outline-primary live-feed--refresh">{{newMessages}} {{_ 'live-feed--notification-panel'}}</button>
+			</div>
+		{{/if}}
+	{{#each liveFeedPosts}}
+		{{> liveFeedPost}}
+	{{/each}}
+	{{#if loadMore}}
+		<div class="text-center mb-2">
+			<button type="button" class="btn btn-primary live-feed--load-more"><i class="fas fa-arrow-circle-down"></i> {{_ 'live-feed--load-more'}}</button>
+		</div>
+	{{/if}}
+	{{> liveFeedPostEdit}}
+	{{> liveFeedPostDelete}}
+	{{> liveFeedCategorySubmit}}
+	{{> liveFeedCategoryEdit}}
 </template>
\ No newline at end of file
diff --git a/src/client/templates/space/home/home.js b/src/client/templates/space/home/home.js
index 3c484d1..62524d4 100644
--- a/src/client/templates/space/home/home.js
+++ b/src/client/templates/space/home/home.js
@@ -1,3 +1,33 @@
+Template.home.onRendered(function() {
+
+	$('.modal').on('shown.bs.modal', function (e) {
+		  $(this).find('[autofocus]').focus();
+	});
+
+	liveFeedResetFilters();
+	Session.set('postsServerNonReactive', LiveFeedCounts.findOne().count); // Set a non-reactive counter of posts -> here = all server posts
+	liveFeedResetPostInterval();
+
+	this.autorun(function() { // Autorun to reactively update subscription (filtering + interval of loaded posts)
+
+		var postsToSkip = Session.get('postsToSkip');
+		var postsLimit = Session.get('postsLimit');
+
+		var filters = {spaceId:Session.get('spaceId'), type:"liveFeed"};
+		if (Session.get('author') != "")
+			filters = {spaceId:Session.get('spaceId'), type:"liveFeed", author:Session.get('author')};
+		else if (Session.get('liveFeedCategory') != "") {
+			filters = {spaceId:Session.get('spaceId'), type:"liveFeed", category:Session.get('liveFeedCategory')};
+		}
+
+ 		// Interval of posts subscription : load every posts from "postsToSkip" (skip) to "postsLimit" (limit)
+ 		// By default, load the 10 last posts (skip : total posts - 10 / limit : 10)
+ 		// postsLimit (limit) is used to disable reactivity
+		subscription = Meteor.subscribe('posts', filters, postsToSkip, postsLimit);
+	});
+});
+
+
 Template.home.events({
 	
 	'click .home--submit': function(e) {
@@ -28,6 +58,36 @@ Template.home.events({
 		e.preventDefault();
 
 		Spaces.update({_id:this.space._id},{$set: {codePanel:false}});
+	},
+		'click .live-feed--refresh': function(e) { // Refresh posts when user click on new messages button
+		e.preventDefault();
+
+		if (Session.get('author') !== "") {
+			var author = Session.get('author');
+			Session.set('postsServerNonReactive', Authors.findOne({name:author}).nRefs);
+		}
+		else if (Session.get('liveFeedCategory') !== "") {
+			var category = Session.get('liveFeedCategory');
+			Session.set('postsServerNonReactive', Categories.findOne({name:category}).nRefs);
+		}
+		else {
+			Session.set('postsServerNonReactive', LiveFeedCounts.findOne().count);
+		}
+
+		liveFeedResetPostsServerNonReactive();
+	},
+	'click .live-feed--load-more': function(e) {
+		e.preventDefault();
+		
+		// If user want to load more posts, it moves the interval (skip : -10 / limit : +10)
+		if (Session.get('postsToSkip') <= 10) {
+			Session.set('postsLimit',Session.get('postsLimit')+Session.get('postsToSkip'));
+			Session.set('postsToSkip', 0);
+		}
+		else {
+			Session.set('postsLimit',Session.get('postsLimit')+10);
+			Session.set('postsToSkip',Session.get('postsToSkip')-10);
+		}
 	}
 });
 
@@ -36,7 +96,104 @@ Template.home.helpers({
 	homePosts: function() {
 		return Posts.find({type:"home"},{sort: {order: 1}});
 	},
+	homePostsEmpty: function() {
+		return Posts.find({type:"home"},{sort: {order: 1}}).count() == 0;
+	},
 	codePanel: function() {
 		return this.space.codePanel;
+	},
+	liveFeedAddPost: function() {
+		return Template.parentData(1).space.permissions.liveFeedAddPost || Template.parentData(1).space.userId === Meteor.userId() || Roles.userIsInRole(Meteor.userId(), ['admin']) === true;
+	},
+	liveFeedPosts: function() {
+		return Posts.find({type:"liveFeed"},{sort: {submitted: -1}});
+	},
+	newMessages: function() { // Check if server posts  > client posts (if reactive is on)
+
+		var nbPosts = Session.get('postsServerNonReactive');
+		var postsReactiveCount;
+
+		if (Session.get('author') !== "") {
+			var author = Session.get('author');
+			postsReactiveCount = Authors.findOne({name:author}).nRefs;  
+		}
+		else if (Session.get('liveFeedCategory') !== "") {
+			var category = Session.get('liveFeedCategory');
+			postsReactiveCount = Categories.findOne({name:category}).nRefs;  
+		}
+		else {
+			postsReactiveCount = LiveFeedCounts.findOne().count;
+		}
+
+		if (nbPosts < postsReactiveCount) {
+			// If there is no post on the client and one is published, the client will load it reactively.
+			// postsServerNonReactive stays at 0 because there is no refresh, so we have to update it manually.
+			if (nbPosts == 0) { 
+				Session.set('postsServerNonReactive', postsReactiveCount);
+			}
+			else
+				return (postsReactiveCount - nbPosts);
+		}
+		else
+			return false;
+	},
+	loadMore: function() { // Check if user can load more posts
+
+		var serverPosts = 0;
+
+		if (Session.get('author') !== "") {
+			var author = Session.get('author');
+			serverPosts = Authors.findOne({name:author}).nRefs;
+		}
+		else if (Session.get('liveFeedCategory') !== "") {
+			var category = Session.get('liveFeedCategory');
+			serverPosts = Categories.findOne({name:category}).nRefs;
+		}
+		else
+			serverPosts = LiveFeedCounts.findOne().count;
+
+		var serverPostsDiff = serverPosts - Session.get('postsServerNonReactive'); // Check if there are new posts
+		if (serverPostsDiff == 0 && serverPosts > Session.get('postsLimit')) // No new post & posts to load
+			return true
+		else if (serverPostsDiff > 0) {
+			return (serverPosts - serverPostsDiff > Session.get('postsLimit')) // There are new posts, so we remove them from the count
+		}
 	}
-});
\ No newline at end of file
+});
+
+liveFeedResetPostInterval = function() { // Reset interval of post subscription
+	if (Session.get('postsServerNonReactive') >= 10) {
+		Session.set('postsToSkip',Session.get('postsServerNonReactive') - 10);
+		Session.set('postsLimit',10);
+	}
+	else if (Session.get('postsServerNonReactive') >= 1 && Session.get('postsServerNonReactive') < 10) {
+		Session.set('postsToSkip',0);
+		Session.set('postsLimit',Session.get('postsServerNonReactive'));
+	}
+	else {
+		Session.set('postsToSkip',0);
+		Session.set('postsLimit',1);
+	}
+}
+
+
+liveFeedResetPostsServerNonReactive = function() { 
+		if (Session.get('author') !== "") {
+			var author = Session.get('author');
+			Session.set('postsServerNonReactive', Authors.findOne({name:author}).nRefs);
+		}
+		else if (Session.get('liveFeedCategory') !== "") {
+			var category = Session.get('liveFeedCategory');
+			Session.set('postsServerNonReactive', Categories.findOne({name:category}).nRefs);
+		}
+		else
+			Session.set('postsServerNonReactive', LiveFeedCounts.findOne().count);
+
+		liveFeedResetPostInterval();
+	}
+
+
+liveFeedResetFilters = function() {
+	Session.set('author','');
+	Session.set('liveFeedCategory','');
+}
\ No newline at end of file
diff --git a/src/client/templates/space/home/home_post.html b/src/client/templates/space/home/home_post.html
index 2867b9f..39f7963 100644
--- a/src/client/templates/space/home/home_post.html
+++ b/src/client/templates/space/home/home_post.html
@@ -1,19 +1,15 @@
 <template name="homePost">
-	<div class="card mb-4">
-		<div class="card-header d-flex">{{title}}
-			{{#if ownSpace}}
-				<span class="align-baseline ml-auto" id="dropdownMenuLink" data-toggle="dropdown"><i class="fa fa-ellipsis-v fa-fw btn-icon align-baseline"></i></span>
-				<div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
-					<a class="dropdown-item home-post--order-up" href="#"><i class="fas fa-arrow-up"></i> {{_ 'home-post--order-up'}}</a>
-					<a class="dropdown-item home-post--order-down" href="#"><i class="fas fa-arrow-down"></i> {{_ 'home-post--order-down'}}</a>
-
-					<a class="dropdown-item home-post--edit" href="#">{{_ 'post--edit'}}</a>
-					<a class="dropdown-item text-danger home-post--delete" href="#">{{_ 'post--delete'}}</a>
-				</div>
-			{{/if}}
-		</div>
-		<div class="card-body">
-			<p class="card-text home-post--text">{{{body}}}</p>
-		</div>
+	<div class="home-post alert alert-info">
+			<div class="d-flex">
+				<b>{{title}}</b>
+				{{#if ownSpace}}
+					<span class="align-baseline ml-auto" id="dropdownMenuLink" data-toggle="dropdown"><i class="fa fa-ellipsis-v fa-fw btn-icon align-baseline"></i></span>
+					<div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
+						<a class="dropdown-item home-post--edit" href="#">{{_ 'post--edit'}}</a>
+						<a class="dropdown-item text-danger home-post--delete" href="#">{{_ 'post--delete'}}</a>
+					</div>
+				{{/if}}	
+			</div>
+		{{{body}}}
 	</div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/space/home/home_post_edit.html b/src/client/templates/space/home/home_post_edit.html
index e078fd1..a74dffa 100644
--- a/src/client/templates/space/home/home_post_edit.html
+++ b/src/client/templates/space/home/home_post_edit.html
@@ -12,7 +12,7 @@ <h5 class="modal-title" id="exampleModalLabel">{{_ 'home-post-edit--title'}}</h5
       	<form name="home-post-edit--form" id="home-post-edit--form">
 
        	<div class="form-group">
-       		    <input type="text" class="form-control" name="title" id="title" aria-describedby="title" placeholder="Title of the section" value="{{post.title}}"></div>
+       		    <input type="text" class="form-control" name="title" id="title" aria-describedby="title" placeholder="{{_ 'home-post-submit--placeholder'}}" value="{{post.title}}"></div>
        		           	<div class="form-group">
 
 				<textarea name="body" id="body-edit-tinymce" class="form-control home-post-edit--textarea" placeholder="" aria-label="" aria-describedby="basic-addon2">{{post.body}}</textarea>
diff --git a/src/client/templates/space/lessons/lessons.html b/src/client/templates/space/lessons/lessons.html
index 3134005..f2ec211 100644
--- a/src/client/templates/space/lessons/lessons.html
+++ b/src/client/templates/space/lessons/lessons.html
@@ -7,7 +7,9 @@
 		</div>
 	{{/if}}
 	<h5 class="">{{_ 'lessons--title'}}</h5>
-	<div class="text-secondary small mb-4">{{_ 'lessons--subtitle'}}</div>
+	{{#if ownSpace}}
+		<div class="text-secondary small mb-4">{{_ 'lessons--subtitle'}}</div>
+	{{/if}}
 	{{#each lessonsPosts}}
 		{{> lessonsPost}}
 	{{/each}}
diff --git a/src/client/templates/space/live_feed/live_feed.html b/src/client/templates/space/live_feed/live_feed.html
deleted file mode 100644
index edb04aa..0000000
--- a/src/client/templates/space/live_feed/live_feed.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<template name="liveFeed">
-	{{#if liveFeedAddPost}}
-		{{> liveFeedPostSubmit}}
-	{{/if}}
-		{{#if newMessages}}
-			<div class="text-center mb-2">
-				<button type="button" class="btn btn-outline-primary live-feed--refresh">{{newMessages}} {{_ 'live-feed--notification-panel'}}</button>
-			</div>
-		{{/if}}
-	{{#each liveFeedPosts}}
-		{{> liveFeedPost}}
-	{{/each}}
-	{{#if loadMore}}
-		<div class="text-center mb-2">
-			<button type="button" class="btn btn-primary live-feed--load-more"><i class="fas fa-arrow-circle-down"></i> {{_ 'live-feed--load-more'}}</button>
-		</div>
-	{{/if}}
-	{{> liveFeedPostEdit}}
-	{{> liveFeedPostDelete}}
-	{{> liveFeedCategorySubmit}}
-	{{> liveFeedCategoryEdit}}
-</template>
\ No newline at end of file
diff --git a/src/client/templates/space/live_feed/live_feed.js b/src/client/templates/space/live_feed/live_feed.js
deleted file mode 100644
index 6a9c658..0000000
--- a/src/client/templates/space/live_feed/live_feed.js
+++ /dev/null
@@ -1,163 +0,0 @@
-Template.liveFeed.onRendered(function() {
-
-	$('.modal').on('shown.bs.modal', function (e) {
-		  $(this).find('[autofocus]').focus();
-	});
-
-	liveFeedResetFilters();
-	Session.set('postsServerNonReactive', LiveFeedCounts.findOne().count); // Set a non-reactive counter of posts -> here = all server posts
-	liveFeedResetPostInterval();
-
-	this.autorun(function() { // Autorun to reactively update subscription (filtering + interval of loaded posts)
-
-		var postsToSkip = Session.get('postsToSkip');
-		var postsLimit = Session.get('postsLimit');
-
-		var filters = {spaceId:Session.get('spaceId'), type:"liveFeed"};
-		if (Session.get('author') != "")
-			filters = {spaceId:Session.get('spaceId'), type:"liveFeed", author:Session.get('author')};
-		else if (Session.get('liveFeedCategory') != "") {
-			filters = {spaceId:Session.get('spaceId'), type:"liveFeed", category:Session.get('liveFeedCategory')};
-		}
-
- 		// Interval of posts subscription : load every posts from "postsToSkip" (skip) to "postsLimit" (limit)
- 		// By default, load the 10 last posts (skip : total posts - 10 / limit : 10)
- 		// postsLimit (limit) is used to disable reactivity
-		subscription = Meteor.subscribe('posts', filters, postsToSkip, postsLimit);
-	});
-});
-
-
-Template.liveFeed.events({
-
-	'click .live-feed--refresh': function(e) { // Refresh posts when user click on new messages button
-		e.preventDefault();
-
-		if (Session.get('author') !== "") {
-			var author = Session.get('author');
-			Session.set('postsServerNonReactive', Authors.findOne({name:author}).nRefs);
-		}
-		else if (Session.get('liveFeedCategory') !== "") {
-			var category = Session.get('liveFeedCategory');
-			Session.set('postsServerNonReactive', Categories.findOne({name:category}).nRefs);
-		}
-		else {
-			Session.set('postsServerNonReactive', LiveFeedCounts.findOne().count);
-		}
-
-		liveFeedResetPostsServerNonReactive();
-	},
-	'click .live-feed--load-more': function(e) {
-		e.preventDefault();
-		
-		// If user want to load more posts, it moves the interval (skip : -10 / limit : +10)
-		if (Session.get('postsToSkip') <= 10) {
-			Session.set('postsLimit',Session.get('postsLimit')+Session.get('postsToSkip'));
-			Session.set('postsToSkip', 0);
-		}
-		else {
-			Session.set('postsLimit',Session.get('postsLimit')+10);
-			Session.set('postsToSkip',Session.get('postsToSkip')-10);
-		}
-	}
-});
-
-
-Template.liveFeed.helpers({
-
-	liveFeedAddPost: function() {
-		return Template.parentData(1).space.permissions.liveFeedAddPost || Template.parentData(1).space.userId === Meteor.userId() || Roles.userIsInRole(Meteor.userId(), ['admin']) === true;
-	},
-	liveFeedPosts: function() {
-		return Posts.find({type:"liveFeed"},{sort: {submitted: -1}});
-	},
-	newMessages: function() { // Check if server posts  > client posts (if reactive is on)
-
-		var nbPosts = Session.get('postsServerNonReactive');
-		var postsReactiveCount;
-
-		if (Session.get('author') !== "") {
-			var author = Session.get('author');
-			postsReactiveCount = Authors.findOne({name:author}).nRefs;  
-		}
-		else if (Session.get('liveFeedCategory') !== "") {
-			var category = Session.get('liveFeedCategory');
-			postsReactiveCount = Categories.findOne({name:category}).nRefs;  
-		}
-		else {
-			postsReactiveCount = LiveFeedCounts.findOne().count;
-		}
-
-		if (nbPosts < postsReactiveCount) {
-			// If there is no post on the client and one is published, the client will load it reactively.
-			// postsServerNonReactive stays at 0 because there is no refresh, so we have to update it manually.
-			if (nbPosts == 0) { 
-				Session.set('postsServerNonReactive', postsReactiveCount);
-			}
-			else
-				return (postsReactiveCount - nbPosts);
-		}
-		else
-			return false;
-	},
-	loadMore: function() { // Check if user can load more posts
-
-		var serverPosts = 0;
-
-		if (Session.get('author') !== "") {
-			var author = Session.get('author');
-			serverPosts = Authors.findOne({name:author}).nRefs;
-		}
-		else if (Session.get('liveFeedCategory') !== "") {
-			var category = Session.get('liveFeedCategory');
-			serverPosts = Categories.findOne({name:category}).nRefs;
-		}
-		else
-			serverPosts = LiveFeedCounts.findOne().count;
-
-		var serverPostsDiff = serverPosts - Session.get('postsServerNonReactive'); // Check if there are new posts
-		if (serverPostsDiff == 0 && serverPosts > Session.get('postsLimit')) // No new post & posts to load
-			return true
-		else if (serverPostsDiff > 0) {
-			return (serverPosts - serverPostsDiff > Session.get('postsLimit')) // There are new posts, so we remove them from the count
-		}
-	},
-});
-
-
-liveFeedResetPostInterval = function() { // Reset interval of post subscription
-	if (Session.get('postsServerNonReactive') >= 10) {
-		Session.set('postsToSkip',Session.get('postsServerNonReactive') - 10);
-		Session.set('postsLimit',10);
-	}
-	else if (Session.get('postsServerNonReactive') >= 1 && Session.get('postsServerNonReactive') < 10) {
-		Session.set('postsToSkip',0);
-		Session.set('postsLimit',Session.get('postsServerNonReactive'));
-	}
-	else {
-		Session.set('postsToSkip',0);
-		Session.set('postsLimit',1);
-	}
-}
-
-
-liveFeedResetPostsServerNonReactive = function() { 
-		if (Session.get('author') !== "") {
-			var author = Session.get('author');
-			Session.set('postsServerNonReactive', Authors.findOne({name:author}).nRefs);
-		}
-		else if (Session.get('liveFeedCategory') !== "") {
-			var category = Session.get('liveFeedCategory');
-			Session.set('postsServerNonReactive', Categories.findOne({name:category}).nRefs);
-		}
-		else
-			Session.set('postsServerNonReactive', LiveFeedCounts.findOne().count);
-
-		liveFeedResetPostInterval();
-	}
-
-
-liveFeedResetFilters = function() {
-	Session.set('author','');
-	Session.set('liveFeedCategory','');
-}
\ No newline at end of file
diff --git a/src/client/templates/space/live_feed/live_feed_delete_comment.html b/src/client/templates/space/live_feed/live_feed_delete_comment.html
index a0fa22c..929930a 100644
--- a/src/client/templates/space/live_feed/live_feed_delete_comment.html
+++ b/src/client/templates/space/live_feed/live_feed_delete_comment.html
@@ -3,17 +3,15 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel">Delete comment</h5>
+        <h5 class="modal-title" id="exampleModalLabel">{{_ 'live-feed-delete-comment--title'}}</h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <div class="modal-body">
-        Delete this comment?
-      </div>
+      <div class="modal-body">{{_ 'live-feed-delete-comment--subtitle'}}</div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-danger live-feed--delete-comment--confirm">Delete</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{_ 'modal--close'}}</button>
+        <button type="button" class="btn btn-danger live-feed--delete-comment--confirm">{{_ 'modal--delete'}}</button>
       </div>
     </div>
   </div>
diff --git a/src/client/templates/space/live_feed/live_feed_post.html b/src/client/templates/space/live_feed/live_feed_post.html
index aa3ecc3..30db353 100644
--- a/src/client/templates/space/live_feed/live_feed_post.html
+++ b/src/client/templates/space/live_feed/live_feed_post.html
@@ -1,12 +1,12 @@
 <template name="liveFeedPost">
-	<div class="card rounded-0" style="border-radius: 0.25rem 0.25rem 0 0 !important;">
+	<div class="card rounded-0 mb-5" style="border-radius: 0.25rem 0.25rem 0 0 !important;">
 		{{#if this.fileId}}
 			{{#if image}}
 				<div class="life-feed-post--image-wrapper">
 					<a class="life-feed-post--image-link" href="/upload{{filePath}}" target="_blank">
 						<img class="card-img-top" src="/upload{{filePath}}" alt="Card image cap" />
 					</a>
-			</div>
+				</div>
 			{{/if}}
 		{{/if}}
 		<div class="card-body">
@@ -28,24 +28,29 @@ <h6 class="card-title">{{author}}<small class="text-muted ml-1">• {{livestamp
 				{{/unless}}
 			{{/if}}
 			{{#if category}}
-				<div class="small text-secondary float-right"><i class="fas fa-tag"></i> {{category}}</div>
+				<div class="small text-secondary float-right ml-3"><i class="fas fa-tag"></i> {{category}}</div>
+			{{/if}}
+			{{#if latitude}}
+			<div class="small text-secondary float-right">
+				<i class="fa fa-map-marker-alt"></i> {{locality}}
+<!-- 				<a href="#" class="live-feed-post-2-open-mini-map" data-latitude="44"><i class="fa fa-map-marker-alt"></i> {{locality}}</a>
+ -->			</div>
 			{{/if}}
 			{{#if likeAlready}}
-				<a href="#" class="btn-link-black live-feed-post--remove-like text-primary"><i class="fas fa-thumbs-up"></i></a>
+				<a href="#" class="btn-link-grey live-feed-post--remove-like text-primary"><i class="fas fa-thumbs-up"></i></a>
 				{{#if othersLikes}}
 					<span class="small">{{_ 'live-feed-post--nb-likes-with-me' likesWithoutMe}}</span>
 				{{else}}
 					<span class="small">{{_ 'live-feed-post--like'}}</span>
 				{{/if}}
 			{{else}}
-				<a href="#" class="btn-link-black live-feed-post--add-like"><i class="far fa-thumbs-up"></i></a>
+				<a href="#" class="btn-link-grey live-feed-post--add-like"><i class="far fa-thumbs-up"></i></a>
 				{{#if likes}}
 					<span class="small">{{likes}} {{_ 'live-feed-post--nb-likes'}}</span>
 				{{/if}}
 			{{/if}}
 		</div>
-	</div>
-	<div class="border border-top-0 rounded-bottom mb-4 p-2 bg-light small">
+	<div class="rounded-bottom p-2 small" style="background:#f2f9ff">
 		{{#each comments}}
 			<div class="border-bottom mb-2 p-1">
 				{{#if ownComment}}
@@ -56,7 +61,7 @@ <h6 class="card-title">{{author}}<small class="text-muted ml-1">• {{livestamp
 				<div class="mt-1">{{#autolink}}{{this.text}}{{/autolink}}</div>
 				{{#if likeAlreadyComment}}
 					<div class="mt-2 small">
-						<a href="#" class="btn-link-black live-feed-post--comment-remove-like text-primary" data-postid="{{../_id}}"><i class="fas fa-thumbs-up" data-postid="{{../_id}}"></i></a>
+						<a href="#" class="live-feed-post--comment-remove-like text-primary" data-postid="{{../_id}}"><i class="fas fa-thumbs-up" data-postid="{{../_id}}"></i></a>
 						{{#if othersLikesComment}}
 							<span>{{_ 'live-feed-post--nb-likes-with-me' likesWithoutMeComment}}</span>
 						{{else}}
@@ -65,7 +70,7 @@ <h6 class="card-title">{{author}}<small class="text-muted ml-1">• {{livestamp
 					</div>
 				{{else}}
 					<div class="mt-2 small">
-						<a href="#" class="btn-link-black live-feed-post--comment-add-like" data-postid="{{../_id}}"><i class="far fa-thumbs-up" data-postid="{{../_id}}"></i></a>
+						<a href="#" class="live-feed-post--comment-add-like" data-postid="{{../_id}}"><i class="far fa-thumbs-up" data-postid="{{../_id}}"></i></a>
 						{{#if likesComment}}
 							<span>{{likesComment}}</span>
 						{{/if}}
@@ -76,5 +81,6 @@ <h6 class="card-title">{{author}}<small class="text-muted ml-1">• {{livestamp
 		<div class="form-group mb-0">
 			<textarea class="form-control live-feed-post--add-comment-textarea" id="comment" rows="1" placeholder="{{_ 'live-feed-post--add-comment'}}"></textarea>
 		</div>
-	</div>
+	</div>	</div>
+
 </template>
\ No newline at end of file
diff --git a/src/client/templates/space/live_feed/live_feed_post_submit.html b/src/client/templates/space/live_feed/live_feed_post_submit.html
index 96db867..a11bebc 100644
--- a/src/client/templates/space/live_feed/live_feed_post_submit.html
+++ b/src/client/templates/space/live_feed/live_feed_post_submit.html
@@ -1,46 +1,55 @@
 <template name="liveFeedPostSubmit">
-	<div class="card mb-5 bg-light">
-		<div class="card-body">
+	<div class="live-feed-post-submit mb-4 mt-4">
+		<div>
 			<form name="live-feed-post-submit--form" id="live-feed-post-submit--form">
 				{{#if fileUploaded}}
 					{{#unless fileUploaded.error}}
 						{{#if image}}
 							<div class="mt-2 mb-4 text-center">
-								<img class="card-img-top" src="/upload{{filePath}}" alt="" />
+								<img class="card-img-top" src="/upload{{filePath}}" alt="" /><br>
 			 					<a href="#" class="post-submit--button-delete-image"><i class="fa fa-trash" aria-hidden="true"></i> {{_ 'post-submit--delete-image'}}</a>
 			 				</div>
 		 				{{/if}}
 		 			{{/unless}}
 				{{/if}}
-				<div class="form-group">
-					<textarea rows="1" name="body" id="body" class="form-control post-submit--textarea" placeholder="{{_ 'post-submit--body-placeholder'}}" aria-label="{{_ 'post-submit--body-placeholder'}}"></textarea>
+				<div class="row mb-2">
+					<div class="col-10">
+						<textarea rows="1" name="body" id="body" class="form-control post-submit--textarea" placeholder="{{_ 'post-submit--body-placeholder'}}" aria-label="{{_ 'post-submit--body-placeholder'}}"></textarea>
+					</div>
+					<div class="col-2 d-none d-lg-inline-block  mb-0" style="margin-left:-15px;">
+						<button class="btn btn-outline-primary live-feed-post-submit--button-submit" style="" type="button">{{_ 'modal--submit'}}</button>
+					</div>	
+					<div class="col-2 text-left d-lg-none" style="margin-left:-15px;">
+						<button class="btn btn-outline-primary live-feed-post-submit--button-submit" style="" type="button"><i class="fas fa-paper-plane"></i></button>
+					</div>	
 				</div>
-				<div class="form-group d-none d-lg-block float-right mb-0">
-					<button class="btn btn-outline-secondary bg-primary text-white border-0 live-feed-post-submit--button-submit" type="button">{{_ 'modal--submit'}}</button>
-				</div>	
-				<div class="form-group float-lg-right mb-lg-2 mr-4">
-					<div class="input-group float-lg-right mb-lg-2 mr-4">
-						<div class="input-group-prepend">
-					    	<label class="input-group-text" for="inputGroupSelect01"><i class="fas fa-tag"></i></label>
-					  	</div>
-						<select class="custom-select" name="categorySelect" id="categorySelect">
-		    				<option val="" disabled selected>{{_ 'post-submit--select-category'}}</option>
-		    	      		<option val="">{{_ 'post-submit--no-category'}}</option>
-		    				{{#each categories}}
-		      					<option {{selectedOption name}}>{{name}}</option>
-		      				{{/each}}
-		      				{{#if liveFeedAddCategory}}
-		      					<option style="color:red" value="add-category">{{_ 'live-feed-post-submit--add-category'}}</option>
-		      				{{/if}}
-						</select>
+				<div class="row">
+					<div class="col-4 col-lg-5">			  
+						{{#unless fileUploaded}}
+		          			{{>fileUpload formData=formData autoStart=true}}
+						{{/unless}}
+					</div>
+					<div class="col-8 col-lg-5">
+						<div class="input-group" style="">
+							<div class="input-group-prepend">
+						    	<label class="input-group-text" for="inputGroupSelect01" style="background:none !important;"><i class="fas fa-tag"></i></label>
+						  	</div>
+							<select class="custom-select" style="height:30px;font-size:0.75em;" name="categorySelect" id="categorySelect">
+			    				<option val="" disabled selected>{{_ 'post-submit--select-category'}}</option>
+			    	      		<option val="">{{_ 'post-submit--no-category'}}</option>
+			    				{{#each categories}}
+			      					<option {{selectedOption name}}>{{name}}</option>
+			      				{{/each}}
+			      				{{#if liveFeedAddCategory}}
+			      					<option style="color:red" value="add-category">{{_ 'live-feed-post-submit--add-category'}}</option>
+			      				{{/if}}
+							</select>
+						</div>	
+					</div>
+		  			<div class="form-group d-none d-lg-none float-right mb-0">
+						<button class="btn btn-outline-secondary bg-primary text-white border-0 live-feed-post-submit--button-submit" type="button">{{_ 'modal--submit'}}</button>
 					</div>	
 				</div>
-	  			<div class="form-group d-lg-none float-right mb-0">
-					<button class="btn btn-outline-secondary bg-primary text-white border-0 live-feed-post-submit--button-submit" type="button">{{_ 'modal--submit'}}</button>
-				</div>				  
-				{{#unless fileUploaded}}
-          			{{>fileUpload formData=formData autoStart=true}}
-				{{/unless}}
 				{{#if fileUploaded}}
 					{{#if fileUploaded.error}}
           				<div class=""><span class="text-danger">{{fileUploaded.error}}</span> (<a href="#" class="live-feed-post-submit--retry">retry</a>)</div>
diff --git a/src/client/templates/space/settings/general_settings.js b/src/client/templates/space/settings/general_settings.js
index b279d15..058c85a 100644
--- a/src/client/templates/space/settings/general_settings.js
+++ b/src/client/templates/space/settings/general_settings.js
@@ -46,8 +46,8 @@ Template.generalSettings.events({
 
 		var newName = prompt(TAPi18n.__('space-edit--rename-space-message')+" :", this.space.title);
 		if (newName && newName != currentSpaceName && newName !="") {
-			if (newName.length < 4 || newName.length > 19) {
-				alert("The name must be at least 3 characters and at most 20");
+			if (newName.length < 4 || newName.length > 35) {
+				alert("The name must be at least 3 characters and at most 35");
 			}
 			else {
 				var spaceProperties = {
diff --git a/src/client/templates/space/settings/modules_settings.html b/src/client/templates/space/settings/modules_settings.html
index 6203a30..75f5739 100644
--- a/src/client/templates/space/settings/modules_settings.html
+++ b/src/client/templates/space/settings/modules_settings.html
@@ -1,9 +1,6 @@
 <template name="modulesSettings">
 	<h6 class="mb-3 mt-4">Modules</h6>
 	<div class="list-group w-100">
-  		<a href="#" class="list-group-item list-group-item-action d-flex modules-settings--live-feed align-middle"><span><i class="fa fa-bolt fa-fw"></i> Live Feed<p class="small text-secondary">Real-time interactions feed. Everyone can share and interact using pictures, files, and messages.</p></span><span class="ml-auto">{{#if space.liveFeed}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span>
-  			</a>
-  		<a href="#" class="list-group-item list-group-item-action d-flex modules-settings--lessons align-middle"><span><i class="fa fa-chalkboard-teacher fa-fw"></i> Lessons<p class="small text-secondary">Allows to import and serve E-learning packages (currently supports Articulate Storyline only).</p></span><span class="ml-auto">{{#if space.lessons}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
-  		<a href="#" class="list-group-item list-group-item-action d-flex modules-settings--resources align-middle"><span><i class="far fa-copy fa-fw"></i> Resources<p class="small text-secondary">Distribute files to your learners.</p></span><span class="ml-auto">{{#if space.resources}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
+  		<a href="#" class="list-group-item list-group-item-action d-flex modules-settings--resources align-middle"><span><i class="far fa-copy fa-fw"></i> Resources<p class="small text-secondary">{{_ 'space-edit--module-resources'}}</p></span><span class="ml-auto">{{#if space.resources}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
   	</div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/space/settings/permissions_settings.html b/src/client/templates/space/settings/permissions_settings.html
index 5cf532d..c0b2e67 100644
--- a/src/client/templates/space/settings/permissions_settings.html
+++ b/src/client/templates/space/settings/permissions_settings.html
@@ -2,9 +2,9 @@
 	<h6 class="mb-3 mt-4">Permissions</h6>
 	<div class="list-group w-100">
 		{{#if isBox}}
-			<a href="#" class="list-group-item list-group-item-action d-flex permissions-settings--public"><span>Public Space<p class="small text-secondary">Allows anyone to access the contents and interact within this Space without needing an Access Code.</p></span><span class="ml-auto">{{#if space.permissions.public}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
+			<a href="#" class="list-group-item list-group-item-action d-flex permissions-settings--public"><span>Public Space<p class="small text-secondary">{{_ 'space-edit--permissions-public-space'}}</p></span><span class="ml-auto">{{#if space.permissions.public}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
 		{{/if}}
-  		<a href="#" class="list-group-item list-group-item-action d-flex permissions-settings--liveFeedAddCategory"><span>Users can add categories in Live Feed</span><span class="ml-auto">{{#if space.permissions.liveFeedAddCategory}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
-  		<a href="#" class="list-group-item list-group-item-action d-flex permissions-settings--liveFeedAddPost"><span>Users can add posts in Live Feed</span><span class="ml-auto">{{#if space.permissions.liveFeedAddPost}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
+  		<a href="#" class="list-group-item list-group-item-action d-flex permissions-settings--liveFeedAddCategory"><span>{{_ 'space-edit--permissions-add-categories'}}</span><span class="ml-auto">{{#if space.permissions.liveFeedAddCategory}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
+  		<a href="#" class="list-group-item list-group-item-action d-flex permissions-settings--liveFeedAddPost"><span>{{_ 'space-edit--permissions-add-posts'}}</span><span class="ml-auto">{{#if space.permissions.liveFeedAddPost}}<i class="far fa-check-square"></i>{{else}}<i class="far fa-square"></i>{{/if}}</span></a>
   	</div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/space/settings/settings.html b/src/client/templates/space/settings/settings.html
index 9bb4fd5..62d368f 100644
--- a/src/client/templates/space/settings/settings.html
+++ b/src/client/templates/space/settings/settings.html
@@ -2,7 +2,7 @@
 	{{> backHeader}}
 	<div class="container h-100">
 		<div class="row justify-content-center min-h-100">
-    		<div class="col-sm-12 col-lg-8 bg-white border-left border-right min-h-100 pt-4 pl-4 pr-4">
+    		<div class="col-sm-12 col-lg-8 min-h-100 pt-4 pl-4 pr-4 pb-4">
                 <h3 class="mb-4">{{_ 'space-edit--page-title'}}</h3>
     			{{> generalSettings}}
                 {{> modulesSettings}}
diff --git a/src/client/templates/space/space.html b/src/client/templates/space/space.html
index d1bd298..c9b88cc 100644
--- a/src/client/templates/space/space.html
+++ b/src/client/templates/space/space.html
@@ -7,16 +7,10 @@
                 <div class="d-none d-sm-none d-lg-block col-3 mt-4 sidebar-sticky">
         		  {{> spaceSidebar}}
                 </div>
-            	<div class="col-sm-12 col-lg-8 bg-white border-left border-right min-h-100 pt-4 pl-4 pr-4">
+            	<div class="col-sm-12 col-lg-8 min-h-100 pt-4 pl--lg-4 pr-lg-4">
             		{{#if menuItem 1}}
             			{{> home}}
             		{{/if}}
-            		{{#if menuItem 2}}
-            			{{> liveFeed}}
-        			{{/if}}
-        			{{#if menuItem 3}}
-            			{{> lessons}}
-            		{{/if}}
             		{{#if menuItem 4}}
             			{{> resources}}
             		{{/if}}
diff --git a/src/client/templates/space/space_sidebar.html b/src/client/templates/space/space_sidebar.html
index e2d8b45..b30bb76 100644
--- a/src/client/templates/space/space_sidebar.html
+++ b/src/client/templates/space/space_sidebar.html
@@ -1,101 +1,104 @@
 <template name="spaceSidebar">
 	<div class="bg-beekee pt-5 d-lg-none">
-		<img style="height: 50px;" class="pl-3 pb-3 mt-3" alt="logo" src="/img/logo_sidebar.png">
+		<img style="height: 80px;" class="pl-2 pb-2 mt-3" alt="logo" src="/img/logo_white.svg">
+		<div class="pl-2 pb-2 small">{{space.title}}</div>
 	</div>
 	<ul class="sidebar nav flex-column align-items-start justify-content-between">
-		<li class="nav-item sidebar-item w-100 {{selectedMenuItemBg 1}}">
-			<a class="nav-link pl-1 text-nowrap text-dark menu-item {{selectedMenuItemTxt 1}} pl-3 pl-lg-0 py-3 py-lg-2" data-id="1" href="#">
+		<li class="nav-item sidebar-item {{selectedMenuItemBg 1}}">
+			<a class="nav-link pl-1 filter-live-feed-all text-nowrap menu-item {{selectedMenuItemTxt 1}} pl-3 pl-lg-0 py-3 py-lg-2" data-id="1" href="#">
 				<i class="fa fa-home fa-fw"></i> 
 				<span class="pl-1">{{_ 'space-sidebar--home'}}</span>
+				<span class="badge badge-secondary-2 ml-2">{{liveFeedCount}}</span>
 			</a> 
 		</li> 	
-		{{#if liveFeed}}						
-			<li class="nav-item sidebar-item w-100 {{selectedMenuItemBg 2}}">
-				<a class="nav-link pl-1 text-nowrap text-dark menu-item filter-live-feed-all {{selectedMenuItemTxt 2}} pl-3 pl-lg-0 py-3 py-lg-2" data-id="2" href="#">
-					<i class="fa fa-bolt fa-fw"></i> 
-					<span class="pl-1">{{_ 'space-sidebar--live-feed'}}</span>
-					<span class="badge badge-secondary-2 ml-2">{{liveFeedCount}}</span>
-				</a>
-			</li>
-		{{/if}}
-		{{#if selectedMenuItem 2}}
-			<a class="small pl-4 pt-3 text-secondary mb-1 space-sidebar--menu-collapse" data-toggle="collapse" aria-expanded="true" href=".categories-list"><i class="fas fa-tags"></i> {{_ 'space-sidebar--categories'}} <i class="fa ml-1" aria-hidden="true"></i></a>
+		{{#if selectedMenuItem 1}}
+		<div class="sidebar--submenu">
+			<a class="pl-2 mt-2 d-block mb-1 space-sidebar--menu-collapse" data-toggle="collapse" aria-expanded="true" href=".categories-list">{{_ 'space-sidebar--categories'}} <i class="fa ml-1" aria-hidden="true"></i></a>
 			<div class="collapse categories-list show w-100">
 				{{#each liveFeedCategories}}
-					<li class="align-middle nav-item sidebar-item w-100 small">
-						<a class="align-bottom nav-link space-sidebar--filter-live-feed-category pl-1 py-1 text-nowrap text-dark filter-live-feed-category {{selectedLiveFeedCategory}}  pl-4 py-2 py-lg-2" data-category="{{name}}" href="#"><span class="align-bottom pl-1" data-category="{{name}}">{{name}}</span>
+					<li class="align-middle nav-item sidebar-item w-100">
+						<a class="align-bottom nav-link space-sidebar--filter-live-feed-category text-nowrap filter-live-feed-category {{selectedLiveFeedCategory}} pl-2 py-2 py-lg-1" data-category="{{name}}" href="#"><span class="align-bottom pl-1" data-category="{{name}}">{{name}}</span>
 							<span class="align-baseline text-secondary small ml-1" data-category="{{name}}">{{nRefs}}</span>
 							{{#if ownSpace}}
-								<a class="align-middle space-sidebar--live-feed-category-edit small ml-2" data-category="{{name}}">
+								<a class="align-middle space-sidebar--live-feed-category-edit ml-2" data-category="{{name}}">
 									<i class="align-middle fas fa-pencil-alt" data-category="{{name}}"></i>
 								</a>
 							{{/if}}
 						</a>
 					</li>
 				{{/each}}
-				<div class="pl-3 ml-2 mt-1">
+				<div class="pl-2 ml-2 mt-1">
 					{{#if liveFeedAddCategory}}
-						<a href="#" class="small pt-1 pl-1 font-weight-light" data-toggle="modal" data-target="#liveFeedCategorySubmit">
-							<span class="pl-1"><i class="fas fa-plus"></i> {{_ 'space-sidebar--add-category'}}</span>
+						<a href="#" class="small pt-1 pl-1 sidebar--add" data-toggle="modal" data-target="#liveFeedCategorySubmit">
+							<span class=""><i class="fas fa-plus"></i> {{_ 'space-sidebar--add-category'}}</span>
 						</a>
 					{{/if}}
 				</div>
 			</div>
-			<a class="small pl-4 pt-3 text-secondary mb-1 space-sidebar--menu-collapse" data-toggle="collapse" aria-expanded="false" href=".authors-list"><i class="fas fa-users"></i> {{_ 'space-sidebar--authors'}} <i class="fa ml-1" aria-hidden="true"></i></a>
+			<a class="pl-2 mt-3 d-block mb-1 space-sidebar--menu-collapse" data-toggle="collapse" aria-expanded="false" href=".authors-list">{{_ 'space-sidebar--authors'}} <i class="fa ml-1" aria-hidden="true"></i></a>
 			<div class="collapse authors-list w-100">
 				{{#each authors}}
-				<li class="align-middle nav-item sidebar-item w-100 small w-100">
-					<a class="align-bottom nav-link text-nowrap text-dark filter-author {{selectedAuthor}} pl-4 py-2 py-lg-2" data-author="{{name}}" href="#">
-						<span class="pl-1" data-author="{{name}}">{{name}}</span>
-						<span class="align-baseline text-secondary small ml-1" data-author="{{name}}">{{nRefs}}</span>
+				<li class="align-middle nav-item sidebar-item w-100">
+					<a class="align-bottom nav-link text-nowrap filter-author {{selectedAuthor}} pl-2 py-2 py-lg-1" data-author="{{name}}" href="#">
+						<span class="" data-author="{{name}}">{{name}}</span>
+						<span class="align-baseline text-secondary ml-1" data-author="{{name}}">{{nRefs}}</span>
 					</a>
 				</li>
 				{{/each}}
 			</div>
+		</div>
 		{{/if}}
 		{{#if lessons}}						
-			<li class="nav-item sidebar-item w-100 {{selectedMenuItemBg 3}}">
-				<a class="nav-link pl-1 text-nowrap text-dark menu-item {{selectedMenuItemTxt 3}} pl-3 pl-lg-0 py-3 py-lg-2" data-id="3" href="#">
+			<li class="nav-item sidebar-item {{selectedMenuItemBg 3}} mt-2">
+				<a class="nav-link pl-1 text-nowrap menu-item {{selectedMenuItemTxt 3}} pl-3 pl-lg-0 py-3 py-lg-2" data-id="3" href="#">
 					<i class="fa fa-chalkboard-teacher fa-fw"></i> 
 					<span class="pl-1">{{_ 'space-sidebar--lessons'}}</span>
 				</a>
 			</li>
 		{{/if}}
 		{{#if resources}}	
-			<li class="nav-item sidebar-item w-100 {{selectedMenuItemBg 4}}">
-				<a class="nav-link pl-1 text-nowrap text-dark menu-item filter-resources-all {{selectedMenuItemTxt 4}} pl-3 pl-lg-0 py-3 py-lg-2" data-id="4" href="#">
+			<li class="nav-item sidebar-item {{selectedMenuItemBg 4}} mt-2">
+				<a class="nav-link text-nowrap menu-item filter-resources-all {{selectedMenuItemTxt 4}} pl-3 pl-lg-0 py-3 py-lg-2" data-id="4" href="#">
 					<i class="far fa-copy fa-fw"></i> 
 					<span class="pl-1">{{_ 'space-sidebar--resources'}}</span>
 				</a>
 			</li>
 		{{/if}}			
 		{{#if selectedMenuItem 4}}
-		<a class="small pl-4 pt-3 text-secondary mb-1 space-sidebar--menu-collapse" data-toggle="collapse" aria-expanded="true" href=".categories-list"><i class="fas fa-tags"></i> {{_ 'space-sidebar--categories'}} <i class="fa ml-1" aria-hidden="true"></i></a>
-			<div class="collapse categories-list show w-100">
-				{{#each resourcesCategories}}
-					<li class="align-middle nav-item sidebar-item w-100 small">
-						<a class="align-bottom nav-link space-sidebar--filter-resources-category pl-1 py-1 text-nowrap text-dark filter-resources-category {{selectedResourcesCategory}}  pl-4 py-2 py-lg-2" data-category="{{name}}" href="#"><span class="align-bottom pl-1" data-category="{{name}}">{{name}}</span>
-							<span class="align-baseline text-secondary small ml-1" data-category="{{name}}">{{nRefs}}</span>
-							{{#if ownSpace}}
-								<a class="align-middle space-sidebar--resources-category-edit small ml-2" data-category="{{name}}">
-									<i class="align-middle fas fa-pencil-alt" data-category="{{name}}"></i>
-								</a>
-							{{/if}}
-						</a>
-					</li>
-				{{/each}}
-				<div class="pl-3 ml-2 mt-1">
-					{{#if ownSpace}}
-						<a href="#" class="small pt-1 pl-1 font-weight-light" data-toggle="modal" data-target="#resourcesCategorySubmit">
-							<span class="pl-1"><i class="fas fa-plus"></i> {{_ 'space-sidebar--add-category'}}</span>
-						</a>
-					{{/if}}
+		<div class="sidebar--submenu">
+			<a class="pl-2 mt-2 d-block mb-1 space-sidebar--menu-collapse" data-toggle="collapse" aria-expanded="true" href=".categories-list">{{_ 'space-sidebar--categories'}} <i class="fa ml-1" aria-hidden="true"></i></a>
+				<div class="collapse categories-list show w-100">
+					{{#each resourcesCategories}}
+						<li class="align-middle nav-item sidebar-item w-100">
+							<a class="align-bottom nav-link space-sidebar--filter-resources-category text-nowrap text-dark filter-resources-category {{selectedResourcesCategory}} pl-2 py-2 py-lg-1" data-category="{{name}}" href="#"><span class="align-bottom pl-1" data-category="{{name}}">{{name}}</span>
+								<span class="align-baseline text-secondary small ml-1" data-category="{{name}}">{{nRefs}}</span>
+								{{#if ownSpace}}
+									<a class="align-middle space-sidebar--resources-category-edit ml-2" data-category="{{name}}">
+										<i class="align-middle fas fa-pencil-alt" data-category="{{name}}"></i>
+									</a>
+								{{/if}}
+							</a>
+						</li>
+					{{/each}}
+					<div class="pl-2 ml-2 mt-1">
+						{{#if ownSpace}}
+							<a href="#" class="small pt-1 pl-1 sidebar--add" data-toggle="modal" data-target="#resourcesCategorySubmit">
+								<span class=""><i class="fas fa-plus"></i> {{_ 'space-sidebar--add-category'}}</span>
+							</a>
+						{{/if}}
+					</div>
 				</div>
 			</div>	
 		{{/if}}
 	</ul>
-		<select id="langSelect" class="mt-5 custom-select custom-select-sm border-0 ml-3 ml-lg-0 pl-lg-0 mb-2" style="width:auto; background-color: #fafafa;">
-			<option value="en" {{langIsSelected 'en'}}>English</option>
-			<option value="fr-FR" {{langIsSelected 'fr-FR'}}>Français</option>
-		</select>
+	<div class="space-sidebar--credits pl-3 pl-lg-0">
+		<a href="{{pathFor 'indexTeacher'}}">{{_ 'space-sidebar--create-own-space-1'}}</a> {{_ 'space-sidebar--create-own-space-2'}}<br>
+		<a href="{{pathFor 'privacy'}}">{{_ 'space-sidebar--privacy'}}</a><br>
+		<a href="http://www.beekee.ch">{{_ 'space-sidebar--about-us'}}</a>
+	</div>
+
+	<select id="langSelect" class="mt-1 custom-select custom-select-sm border-0 ml-3 ml-lg-0 pl-2 pl-lg-0 mb-2" style="width:auto; background-color: #fafafa;">
+		<option value="en" {{langIsSelected 'en'}}>English</option>
+		<option value="fr-FR" {{langIsSelected 'fr-FR'}}>Français</option>
+	</select>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/space/space_sidebar.js b/src/client/templates/space/space_sidebar.js
index f2aa5a6..1a78158 100644
--- a/src/client/templates/space/space_sidebar.js
+++ b/src/client/templates/space/space_sidebar.js
@@ -9,7 +9,7 @@ Template.spaceSidebar.events({
 		var menuItemId = $(e.currentTarget).attr("data-id");
 		Session.set('menuItem',menuItemId);
 
-		if (menuItemId != "2" && menuItemId != "4") { // Dismiss sidebar unless menuItem is not "Live feed"
+		if (menuItemId != "1" && menuItemId != "2" && menuItemId != "4") { // Dismiss sidebar unless menuItem is not "Live feed"
 			$('#sidebar').removeClass('active');
 	        $('.overlay').removeClass('active');
 	        $('.collapse.in').removeClass('in');
@@ -103,21 +103,21 @@ Template.spaceSidebar.helpers({
 	},
 	'selectedLiveFeedCategory': function(){
 		if (this.name == Session.get('liveFeedCategory'))
-			return "font-weight-bold menu-item--selected selected"
+			return "menu-item--selected selected"
 		else
-			return "font-weight-light"
+			return ""
 	},
 	'selectedResourcesCategory': function(){
 		if (this.name == Session.get('resourcesCategory'))
-			return "font-weight-bold menu-item--selected selected"
+			return "menu-item--selected selected"
 		else
-			return "font-weight-light"
+			return ""
 	},
 	'selectedAuthor': function(){
 		if (this.name == Session.get('author'))
-			return "font-weight-bold menu-item--selected selected"
+			return "menu-item--selected selected"
 		else
-			return "font-weight-light"
+			return ""
 	},
 	liveFeedCount: function() {
 		var liveFeedCount = LiveFeedCounts.findOne();
diff --git a/src/client/templates/space/space_submit.js b/src/client/templates/space/space_submit.js
index 87608c8..34fc187 100644
--- a/src/client/templates/space/space_submit.js
+++ b/src/client/templates/space/space_submit.js
@@ -5,7 +5,7 @@ Template.spaceSubmit.onRendered(function () {
             "spaceName": {
                 required: true,
                 minlength: 3,
-                maxlength: 20
+                maxlength: 35
             }
         }
     }); 
@@ -20,7 +20,8 @@ Template.spaceSubmit.events({
 		 e.preventDefault();
 
 		var space = {
-			title: $('#spaceName').val().trim()
+			title: $('#spaceName').val().trim(),
+			lang: Session.get('lang')
 		};
 
 		Meteor.call('spaceInsert', space, function(error, result) {
diff --git a/src/client/templates/space/space_users.html b/src/client/templates/space/space_users.html
index ad7c2b6..f41599b 100644
--- a/src/client/templates/space/space_users.html
+++ b/src/client/templates/space/space_users.html
@@ -13,8 +13,8 @@ <h4>{{_ 'space-users--page-title'}}</h4>
 	    						<div class="text-secondary">{{numChars}}/15</div>
 	  						</div>
 	  						<div class="text-right">
-	  	    	    			<a href="{{pathFor 'space' _id=this.space._id}}" role="button" class="btn btn-secondary">Cancel</a>
-	  	    	  				<a href="#" role="button" class="btn btn-primary space-users--button-submit-author">Change</a>
+	  	    	    			<a href="{{pathFor 'space' _id=this.space._id}}" role="button" class="btn btn-secondary">{{_ 'modal--cancel'}}</a>
+	  	    	  				<a href="#" role="button" class="btn btn-primary space-users--button-submit-author">{{_ 'modal--submit'}}</a>
 							</div>
 						</form>
 					</div>
diff --git a/src/client/templates/space/space_users_first_connection.html b/src/client/templates/space/space_users_first_connection.html
index b9f901f..307f76a 100644
--- a/src/client/templates/space/space_users_first_connection.html
+++ b/src/client/templates/space/space_users_first_connection.html
@@ -9,7 +9,7 @@ <h4>{{_ 'space-users-first-connection--page-title'}}</h4>
 						<p class="text-secondary">{{_ 'space-users--page-description'}}</p>
 						<form id="space-users--form" name="space-users--form">
 	 						<div class="form-group">
-	    						<input type="text" class="form-control" id="space-users--input" aria-describedby="emailHelp" placeholder="{{_ 'space-users--input-choose-author-placeholder'}}">
+	    						<input type="text" class="form-control" id="space-users-first-connection--author-name" aria-describedby="emailHelp" placeholder="{{_ 'space-users--input-choose-author-placeholder'}}">
 	  						</div>
 	  						<div class="text-right">
 	  	    	    			<a href="{{pathFor 'indexStudent'}}" role="button" class="btn btn-secondary">Cancel</a>
diff --git a/src/client/templates/space/space_users_first_connection.js b/src/client/templates/space/space_users_first_connection.js
index 9bafa99..6bb6431 100644
--- a/src/client/templates/space/space_users_first_connection.js
+++ b/src/client/templates/space/space_users_first_connection.js
@@ -1,9 +1,16 @@
+Template.spaceUsersFirstConnection.onRendered(function () {
+
+    // Enable autofocus
+	$('#space-users-first-connection--author-name').focus();
+});
+
+
 Template.spaceUsersFirstConnection.events({
 	
 	'submit form': function(event, template) {
 		event.preventDefault();
 
-		var authorName = $('#space-users--input').val().trim();
+		var authorName = $('#space-users-first-connection--author-name').val().trim();
 
 		if (authorName != "") {
 			if (Authors.findOne({name:authorName})) {
diff --git a/src/lib/collections/authors.js b/src/lib/collections/authors.js
index 527f9dd..658f73d 100644
--- a/src/lib/collections/authors.js
+++ b/src/lib/collections/authors.js
@@ -14,7 +14,13 @@ Authors.allow({
 Meteor.methods({
 
 	authorInsert: function(name, spaceId) {
-		Authors.insert({name: name, spaceId: spaceId, nRefs: 0});
+		Authors.insert({name: name, spaceId: spaceId, nRefs: 0},function(error) {
+			if (error) {
+				console.log("Error when inserting author  : "+error.message);
+			} else {
+				console.log("Author inserted");
+			}
+		});
 	},
 	authorEdit: function(spaceId, oldName, newName) {
 		var author = Authors.findOne({name: oldName, spaceId: spaceId});
diff --git a/src/lib/collections/posts.js b/src/lib/collections/posts.js
index f1b3327..9cd5b36 100644
--- a/src/lib/collections/posts.js
+++ b/src/lib/collections/posts.js
@@ -166,6 +166,10 @@ Meteor.methods({
 			// postFromCloud: postFromCloud // Workaround bug sync
 		});
 
+		// Get client IP address
+		if (Meteor.isServer)
+			post = _.extend(postAttributes, {clientIP: this.connection.clientAddress});
+
 		var space = Spaces.findOne(postAttributes.spaceId);
 
 		category = Categories.findOne({spaceId: postAttributes.spaceId, name: postAttributes.category}); // Increment category nRefs
diff --git a/src/lib/collections/spaces.js b/src/lib/collections/spaces.js
index 3c6bef9..e39811d 100644
--- a/src/lib/collections/spaces.js
+++ b/src/lib/collections/spaces.js
@@ -69,7 +69,8 @@ if(Meteor.isServer) {
 		spaceInsert: function(spaceAttributes) {
 
 			check(spaceAttributes, {
-					title: String
+					title: String,
+					lang: String
 			});
 
 			var nbOfCodes = Codes.find().count();
@@ -109,7 +110,10 @@ if(Meteor.isServer) {
 			Meteor.call('authorInsert', 'Invité', spaceId );
 
 			// Insert welcome post
-			Posts.insert({spaceId:spaceId, type:"home", order:0, submitted: Date.now(),title: "Welcome!", body:"<p><em>Spaces</em> in Beekee are ideal for real-time interactions using the <strong>Live Feed</strong>, hosting training content in <strong>Lessons</strong> (if enabled) and sharing files with your learners in <strong>Resources</strong>.</p>\n<p>This is the Home page of your space. Right now it is empty but feel free to edit (or delete) this post to start.</p>\n<p>----------------------</p>\n<p>Les <em>Espaces</em>&nbsp;dans Beekee sont le lieu id&eacute;al pour&nbsp;interagir en temps r&eacute;el en utilisant&nbsp;<strong>Direct</strong>,&nbsp;proposer du contenu d'apprentissage dans&nbsp;<strong>Le&ccedil;ons</strong> (si activ&eacute;) et partager des fichiers avec vos apprenants dans&nbsp;<strong>Ressources</strong>.</p>\n<p>Ceci est la page d'accueil de votre espace. Pour l'instant, elle est vide, mais sentez-vous libre de modifier (ou de supprimer) ce post pour d&eacute;buter.</p>"});
+			if (spaceAttributes.lang == "fr-FR" || spaceAttributes.lang == "fr")
+				Posts.insert({spaceId:spaceId, type:"home", order:0, submitted: Date.now(),title: "Bienvenue dans votre nouvel espace Beekee Live !", body:"<p>Beekee Live est l'outil idéal pour soutenir les interactions en temps réel, pour partager des photos ou des fichiers avec vos étudiants.</p>\n<p>Ce message est visible par vos étudiants : sentez-vous libre de le modifier (ou de le supprimer) pour communiquer avec eux.</p>"});
+			else
+				Posts.insert({spaceId:spaceId, type:"home", order:0, submitted: Date.now(),title: "Welcome to your new Beekee Live space!", body:"<p>Beekee Live is ideal for real-time interactions and to share pictures or files with your learners.</p>\n<p>This message will be visibile for everyone: feel free to edit (or delete ) it according to your needs.</p>"});
 
 			return { _id: spaceId };
 		}
diff --git a/src/lib/i18n/en.i18n.json b/src/lib/i18n/en.i18n.json
index 7939151..5e8ba16 100644
--- a/src/lib/i18n/en.i18n.json
+++ b/src/lib/i18n/en.i18n.json
@@ -41,7 +41,7 @@
 	"not-found--page-description":"Sorry, we can not find a page at this address.",
 	"not-found--go-back":"Return to home",
 	"privacy--page-title":"Privacy policy",
-	"privacy--content":"<h1> Teacher Account Information </ h1> <p> When you create a teacher account, you must provide a valid email address and password. These details are not public and can be modified at any time. Beekee.ch will not share this information with third parties. </ P> <h1> Publications, photos, users </ h1> <p> Beekee.ch follows a strict data protection policy. The data published on beekee.ch are hosted on servers located in Switzerland. The beekee platform is therefore subject to Swiss data protection law. Publications, photographs, user names and any other data published on the platform are the exclusive property of the user. At any time, a user may choose to permanently delete his/her data. In no event will beekee.ch transmit this data to third parties. </ P> <h1> Intervention of a technician </ h1> <p> On request of the user, a technician can access a space and consult the data stored on it in order to solve a technical problem. </ p> <h1> Cookies </ h1> <p> Like many websites, beekee.ch uses cookies to facilitate the use of the platform. The information contained in these cookies is not used by beekee.ch for any other purpose. </ P>",
+	"privacy--content":"<h3> Teacher Account Information </h3> <p> When you create a teacher account, you must provide a valid email address and password. These details are not public and can be modified at any time. Beekee Live will not share this information with third parties. </p> <h3> Publications, photos, users </h3> <p> Beekee Live follows a strict data protection policy. The data published on Beekee Live are hosted on servers located in Switzerland. The Beekee Live platform is therefore subject to Swiss data protection law. Publications, photographs, user names and any other data published on the platform are the exclusive property of the user. At any time, a user may choose to permanently delete his/her data. In no event will Beekee Live transmit this data to third parties. </p> <h3> Intervention of a technician </h3> <p> On request of the user, a technician can access a space and consult the data stored on it in order to solve a technical problem. </p> <h3> Cookies </h3> <p> Like many websites, Beekee Live uses cookies to facilitate the use of the platform. The information contained in these cookies is not used by Beekee Live for any other purpose. </p>",
 	"register--page-title":"Create an account",
 	"register--mail":"E-mail",
 	"register--name":"Name",
@@ -102,12 +102,17 @@
 	"space-edit--update-waiting-message":"The box will be updated, please wait...",
 	"space-edit--no-ip":"No IP address",
 	"space-edit--not-connected":"Not connected",
+	"space-edit--module-resources":"Distribute files to your learners",
+	"space-edit--permissions-public-space":"Allows anyone to access the contents and interact within this Space without needing an Access Code",
+	"space-edit--permissions-add-categories":"Users can add categories",
+	"space-edit--permissions-add-posts":"Users can add posts",
 	"space-edit-authors---page-title":"Manage authors",
 	"space-edit-authors---page-description":"Author names are used to identify publications.<br>For example, add the name of your students or the name of a group.",
 	"space-edit-authors---submit-button":"Add",
 	"space-edit-authors--delete-author-message":"Delete the author %s ?",
 	"space-edit-authors--edit-author-message":"Modify the author :",
 	"space-edit-authors--add-author-error-message":"There is already an author with this name.",
+	"index-student--title": "The platform to promote real-time collaboration",
 	"index-student--wrapper-text": "A private space to share photos and messages <br> with your students, colleagues or friends.",
 	"index-student--code": "Private space",
 	"index-student--code-input-placeholder": "Enter an access code",
@@ -116,6 +121,10 @@
 	"index-student--public-spaces-title":"Public spaces",
 	"index-student--button-code-link": "Validate",
 	"index-student--space-doesnt-exist-message": "This space does not exist.\nMake sure to respect the upper and lower case.",
+	"index-student--create-your-space-1": "Create",
+	"index-student--create-your-space-2": " your space in seconds for free!",
+	"index-student--privacy":"Privacy",
+	"index-student--about-us":"About us",
 	"index-teacher--spaces-title": "Your spaces",
 	"index-teacher--no-space": "You have not created a space yet.",
 	"index-teacher--button-submit-space": "Create a new space",
@@ -144,12 +153,16 @@
 	"space-sidebar--home":"Home",
 	"space-sidebar--live-feed":"Live feed",
 	"space-sidebar--categories":"CATEGORIES",
-	"space-sidebar--add-category":"Add a category",
+	"space-sidebar--add-category":"Add",
 	"space-sidebar--authors":"AUTHORS",
 	"space-sidebar--lessons":"Lessons",
 	"space-sidebar--resources":"Resources",
 	"space-submit--create-space":"Create a new space",
 	"space-submit--create-space-placeholer":"Space name",
+	"space-sidebar--create-own-space-1":"Create your own space",
+	"space-sidebar--create-own-space-2":"for free!",
+	"space-sidebar--privacy":"Privacy",
+	"space-sidebar--about-us":"About us",
 	"header--back":"Back",
 	"header--admin-access":"Teacher Access",
 	"header--register":"Create an account",
@@ -201,11 +214,12 @@
 	"home-post-submit--placeholder":"Title of the section",
 	"home-post-submit--confirm-toast":"The new section has been added.",
 	"modal--close":"Close",
+	"modal--cancel":"Cancel",
 	"modal--delete":"Delete",
 	"modal--submit":"Submit",
 	"modal--save":"Save changes",
 	"lessons--title":"Lessons",
-	"lessons--subtitle":"eBriefing materials",
+	"lessons--subtitle":"Articulate Storyline materials",
 	"lessons--submit-button":"Add a lesson",
 	"lessons-post--start-lesson":"Start this lesson",
 	"lessons-post-submit--title":"Add a lesson",
@@ -239,5 +253,7 @@
 	"live-feed-post--like":"You like",
 	"live-feed-post--nb-likes":"people",
 	"live-feed-post-submit--add-category":"+ Add a category...",
-	"live-feed-post-edit--title":"Edit post"
+	"live-feed-post-edit--title":"Edit post",
+	"live-feed-delete-comment--title":"Delete comment",
+	"live-feed-delete-comment--subtitle":"Delete this comment?"
 }
\ No newline at end of file
diff --git a/src/lib/i18n/fr-FR.i18n.json b/src/lib/i18n/fr-FR.i18n.json
index 043cd8c..794eb8d 100644
--- a/src/lib/i18n/fr-FR.i18n.json
+++ b/src/lib/i18n/fr-FR.i18n.json
@@ -41,7 +41,7 @@
 	"not-found--page-description":"Désolé, nous ne pouvons pas trouver une page à cette adresse.",
 	"not-found--go-back":"Revenir à l'accueil",
 	"privacy--page-title":"Politique de confidentialité",
-	"privacy--content":"<h1>Informations sur les comptes enseignants</h1><p>Lorsque vous crééz un compte « enseignant », vous devez fournir une adresse e-mail valide ainsi qu’un mot de passe. Ces données ne sont pas publiques et peuvent être modifiées à tout moment. Beekee.ch ne divulguera en aucun cas ces informations à des tiers.</p><h1>Publications, photos, utilisateurs</h1><p>Beekee.ch suit une politique de protection des données stricte. Les données publiées sur beekee.ch sont hébergées sur des serveurs localisés en Suisse. La plateforme beekee est donc soumise au droit suisse sur la protection des données.Les publications, photographies, noms d’utilisateurs et toutes autres données publiées sur la plateforme sont la propriété exclusive de l’utilisateur. À tout moment, il peut choisir de supprimer définitivement ces données. En aucun cas beekee.ch ne transmettra ces données à des tiers.</p><h1>Intervention d’un technicien</h1><p>Sur demande de l’utilisateur, un technicien peut accéder à un espace et consulter les données qui s’y trouvent pour résoudre un problème technique.</p><h1>Cookies</h1><p>Comme de nombreux sites internet, beekee.ch utilise des cookies pour faciliter l’utilisation de la plateforme. Les informations contenues dans ces cookies ne sont pas utilisées par beekee.ch dans un autre but.</p>",
+	"privacy--content":"<h3>Informations sur les comptes enseignants</h3><p>Lorsque vous crééz un compte « enseignant », vous devez fournir une adresse e-mail valide ainsi qu’un mot de passe. Ces données ne sont pas publiques et peuvent être modifiées à tout moment. Beekee Live ne divulguera en aucun cas ces informations à des tiers.</p><h3>Publications, photos, utilisateurs</h3><p>Beekee Live suit une politique de protection des données stricte. Les données publiées sur Beekee Live sont hébergées sur des serveurs localisés en Suisse. La plateforme Beekee Live est donc soumise au droit suisse sur la protection des données.Les publications, photographies, noms d’utilisateurs et toutes autres données publiées sur la plateforme sont la propriété exclusive de l’utilisateur. À tout moment, il peut choisir de supprimer définitivement ces données. En aucun cas Beekee Live ne transmettra ces données à des tiers.</p><h3>Intervention d’un technicien</h3><p>Sur demande de l’utilisateur, un technicien peut accéder à un espace et consulter les données qui s’y trouvent pour résoudre un problème technique.</p><h3>Cookies</h3><p>Comme de nombreux sites internet, Beekee Live utilise des cookies pour faciliter l’utilisation de la plateforme. Les informations contenues dans ces cookies ne sont pas utilisées par Beekee Live dans un autre but.</p>",
 	"register--page-title":"Créer un compte",
 	"register--mail":"E-mail",
 	"register--name":"Nom",
@@ -102,12 +102,17 @@
 	"space-edit--update-waiting-message":"La box va être mise à jour, merci de patienter...",
 	"space-edit--no-ip":"Pas d'adresse IP",
 	"space-edit--not-connected":"Non connecté",
+	"space-edit--module-resources":"Mettre à disposition des fichiers pour vos étudiants",
+	"space-edit--public-space":"Permet à n'importe qui de se connecter à cet espace sans nécessiter de code d'accès",
+	"space-edit--permissions-add-categories":"Les utilisateurs peuvent ajouter des catégories",
+	"space-edit--permissions-add-posts":"Les utilisateurs peuvent ajouter des posts",
 	"space-edit-authors---page-title":"Gérer les auteurs",
 	"space-edit-authors---page-description":"Les auteurs servent à identifier les publications.<br>Ajoutez par exemple le nom de vos élèves ou le nom d'un groupe.",
 	"space-edit-authors---submit-button":"Ajouter",
 	"space-edit-authors--delete-author-message":"Supprimer l'auteur %s ?",
 	"space-edit-authors--edit-author-message":"Modifier l'auteur :",
 	"space-edit-authors--add-author-error-message":"Il y a déjà un auteur avec ce nom.",
+	"index-student--title": "La plateforme pour soutenir la collaboration en temps réel",
 	"index-student--wrapper-text": "Un espace privé pour partager photos et messages<br>avec vos étudiants, collègues ou amis.",
 	"index-student--code": "Espace privé",
 	"index-student--code-input-placeholder": "Entrez un code d'accès",
@@ -116,6 +121,10 @@
 	"index-student--public-spaces-title":"Espaces publics",
 	"index-student--button-code-link": "Valider",
 	"index-student--space-doesnt-exist-message": "Cet espace n'existe pas.\nAssurez-vous de respecter les majuscules et les minuscules.",
+	"index-student--create-your-space-1": "Créez",
+	"index-student--create-your-space-2": " gratuitement votre propre espace en quelques secondes !",
+	"index-student--privacy":"Confidentialité",
+	"index-student--about-us":"À propos de nous",	
 	"index-teacher--spaces-title": "Vos espaces",
 	"index-teacher--no-space": "Vous n'avez pas encore créé d'espace.",
 	"index-teacher--button-submit-space": "Créer un nouvel espace",
@@ -144,10 +153,14 @@
 	"space-sidebar--home":"Accueil",
 	"space-sidebar--live-feed":"Direct",
 	"space-sidebar--categories":"CATEGORIES",
-	"space-sidebar--add-category":"Ajouter une catégorie",
+	"space-sidebar--add-category":"Ajouter",
 	"space-sidebar--authors":"AUTEURS",
 	"space-sidebar--lessons":"Leçons",
 	"space-sidebar--resources":"Ressources",
+	"space-sidebar--create-own-space-1":"Créé votre propre espace",
+	"space-sidebar--create-own-space-2":"gratuitement !",
+	"space-sidebar--privacy":"Confidentialité",
+	"space-sidebar--about-us":"À propos de nous",
 	"space-submit--create-space":"Créer un nouvel espace",
 	"space-submit--create-space-placeholer":"Nom de l'espace",
 	"header--back":"Retour",
@@ -197,6 +210,7 @@
 	"home-post-delete--title":"Supprimer cette section",
 	"home-post-delete--confirm":"Supprimer cette section ?",
 	"modal--close":"Fermer",
+	"modal--cancel":"Annuler",
 	"modal--delete":"Supprimer",
 	"modal--save":"Sauver les changements",
 	"modal--submit":"Soumettre",
@@ -205,7 +219,7 @@
 	"home-post-submit--placeholder":"Titre de la section",
 	"home-post-submit--confirm-toast":"La section a été ajoutée.",
 	"lessons--title":"Leçons",
-	"lessons--subtitle":"eBriefing materials",
+	"lessons--subtitle":"E-learning Articulate Storyline",
 	"lessons--submit-button":"Ajouter une leçon",
 	"lessons-post--start-lesson":"Lancer cette leçon",
 	"lessons-post-submit--title":"Ajouter une leçon",
@@ -239,5 +253,7 @@
 	"live-feed-post--like":"Vous aimez",
 	"live-feed-post--nb-likes":"personne(s)",
 	"live-feed-post-submit--add-category":"+ Ajouter une catégorie...",
-	"live-feed-post-edit--title":"Éditer un post"
+	"live-feed-post-edit--title":"Éditer un post",
+	"live-feed-delete-comment--title":"Supprimer un commentaire",
+	"live-feed-delete-comment--subtitle":"Supprimer ce commentaire ?"
 }
\ No newline at end of file
diff --git a/src/main.html b/src/main.html
index 69f84af..5c56242 100644
--- a/src/main.html
+++ b/src/main.html
@@ -9,4 +9,5 @@
 	<meta name="google-site-verification" content="YxY2zGSnW7iGyAkXqQjh21ZrI9CTQhOFUztqlrbDeY4" />
 	<link rel="stylesheet" href="/fonts/font-awesome/css/fontawesome-all.min.css">
 	<link rel="stylesheet" href="/fonts/ionicons/css/ionicons.min.css">
+	<link rel="shortcut icon" type="image/ico" href="/img/favicon.png" />
 </head>
\ No newline at end of file
diff --git a/src/private/appLoader.html b/src/private/appLoader.html
index 2a17036..3aaf5ae 100644
--- a/src/private/appLoader.html
+++ b/src/private/appLoader.html
@@ -11,9 +11,10 @@
   #inject-loader-wrapper {
     width: 100%;
     height: 100%;
-    background-color: #343a40;
+    background-color: #1da1f2;
     position:fixed;
     z-index:1000;
+    top:0;
   }
 
   .logo {
@@ -65,7 +66,7 @@
     }
   }
 </style>
-  <div class="logo"><img src="/img/logo_yellow.svg" style="width:140px"></div>
+  <div class="logo"><img src="/img/logo_white.svg" style="width:150px"></div>
 <!--   <div class="spinner">
     <div class="bounce1"></div>
     <div class="bounce2"></div>
diff --git a/src/private/version.json b/src/private/version.json
index a9dffac..efc4cbd 100644
--- a/src/private/version.json
+++ b/src/private/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.29"
+  "version": "1.3"
 }
diff --git a/src/public/img/logo_black.svg b/src/public/img/logo_black.svg
new file mode 100644
index 0000000..dc1e402
--- /dev/null
+++ b/src/public/img/logo_black.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 800 800" style="enable-background:new 0 0 800 800;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#000000;}
+</style>
+<polygon class="st0" points="584.7,309.3 498.3,159.4 421.1,159.4 421.1,182.3 421.1,205.3 471.8,205.3 531.7,309.3 421.1,309.3 
+	421.1,355.2 532.2,355.2 471.6,460.1 421.1,460 421.1,483 421.1,505.9 498.1,506 585.3,355.2 598.2,332.8 "/>
+<polygon class="st0" points="298.2,159.3 211.5,309.3 198.1,332.5 211.2,355.2 298,505.8 375.2,505.9 375.2,483 375.2,460 
+	324.5,460 264.1,355.2 375.2,355.2 375.2,309.3 264.5,309.3 324.7,205.2 375.2,205.2 375.2,182.3 375.2,159.3 "/>
+<g>
+	<path class="st0" d="M197.6,562.2c3,4.2,4.5,9.3,4.5,15.1c0,6.1-1.5,10.9-4.6,14.6c-1.7,2.1-4.2,3.9-7.6,5.6
+		c5.1,1.8,8.9,4.8,11.4,8.7c2.6,4,3.9,8.8,3.9,14.5c0,5.9-1.5,11.1-4.4,15.8c-1.9,3.1-4.2,5.7-7,7.8c-3.2,2.4-6.9,4.1-11.2,5
+		c-4.3,0.9-9,1.3-14,1.3h-44.7v-99.1H172C184,551.8,192.6,555.4,197.6,562.2z M143.8,568.9v21.9h24.1c4.3,0,7.8-0.8,10.5-2.5
+		c2.7-1.6,4-4.5,4-8.7c0-4.6-1.8-7.7-5.3-9.1c-3.1-1-7-1.5-11.7-1.5H143.8z M143.8,607.1v26.4h24.1c4.3,0,7.6-0.6,10-1.7
+		c4.3-2.2,6.5-6.3,6.5-12.4c0-5.2-2.1-8.7-6.3-10.6c-2.3-1.1-5.6-1.6-9.9-1.7H143.8z"/>
+	<path class="st0" d="M296.5,569.2H244v21h48.1v17.2H244v25.5h54.9v17.8h-75.1v-99.1h72.7V569.2z"/>
+	<path class="st0" d="M388.3,569.2h-52.4v21H384v17.2h-48.1v25.5h54.9v17.8h-75.1v-99.1h72.7V569.2z"/>
+	<path class="st0" d="M407.2,551.7h20.4v40.8l38.3-40.8h26.8l-40.7,40.8l42.8,58.3h-26.6l-30.5-43.3l-10,10.1v33.1h-20.4V551.7z"/>
+	<path class="st0" d="M579.6,569.2h-52.4v21h48.1v17.2h-48.1v25.5H582v17.8h-75.1v-99.1h72.7V569.2z"/>
+	<path class="st0" d="M671.4,569.2H619v21h48.1v17.2H619v25.5h54.9v17.8h-75.1v-99.1h72.7V569.2z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/src/public/img/logo_white.svg b/src/public/img/logo_white.svg
new file mode 100644
index 0000000..4de878f
--- /dev/null
+++ b/src/public/img/logo_white.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 800 800" style="enable-background:new 0 0 800 800;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffffff;}
+</style>
+<polygon class="st0" points="584.7,309.3 498.3,159.4 421.1,159.4 421.1,182.3 421.1,205.3 471.8,205.3 531.7,309.3 421.1,309.3 
+	421.1,355.2 532.2,355.2 471.6,460.1 421.1,460 421.1,483 421.1,505.9 498.1,506 585.3,355.2 598.2,332.8 "/>
+<polygon class="st0" points="298.2,159.3 211.5,309.3 198.1,332.5 211.2,355.2 298,505.8 375.2,505.9 375.2,483 375.2,460 
+	324.5,460 264.1,355.2 375.2,355.2 375.2,309.3 264.5,309.3 324.7,205.2 375.2,205.2 375.2,182.3 375.2,159.3 "/>
+<g>
+	<path class="st0" d="M197.6,562.2c3,4.2,4.5,9.3,4.5,15.1c0,6.1-1.5,10.9-4.6,14.6c-1.7,2.1-4.2,3.9-7.6,5.6
+		c5.1,1.8,8.9,4.8,11.4,8.7c2.6,4,3.9,8.8,3.9,14.5c0,5.9-1.5,11.1-4.4,15.8c-1.9,3.1-4.2,5.7-7,7.8c-3.2,2.4-6.9,4.1-11.2,5
+		c-4.3,0.9-9,1.3-14,1.3h-44.7v-99.1H172C184,551.8,192.6,555.4,197.6,562.2z M143.8,568.9v21.9h24.1c4.3,0,7.8-0.8,10.5-2.5
+		c2.7-1.6,4-4.5,4-8.7c0-4.6-1.8-7.7-5.3-9.1c-3.1-1-7-1.5-11.7-1.5H143.8z M143.8,607.1v26.4h24.1c4.3,0,7.6-0.6,10-1.7
+		c4.3-2.2,6.5-6.3,6.5-12.4c0-5.2-2.1-8.7-6.3-10.6c-2.3-1.1-5.6-1.6-9.9-1.7H143.8z"/>
+	<path class="st0" d="M296.5,569.2H244v21h48.1v17.2H244v25.5h54.9v17.8h-75.1v-99.1h72.7V569.2z"/>
+	<path class="st0" d="M388.3,569.2h-52.4v21H384v17.2h-48.1v25.5h54.9v17.8h-75.1v-99.1h72.7V569.2z"/>
+	<path class="st0" d="M407.2,551.7h20.4v40.8l38.3-40.8h26.8l-40.7,40.8l42.8,58.3h-26.6l-30.5-43.3l-10,10.1v33.1h-20.4V551.7z"/>
+	<path class="st0" d="M579.6,569.2h-52.4v21h48.1v17.2h-48.1v25.5H582v17.8h-75.1v-99.1h72.7V569.2z"/>
+	<path class="st0" d="M671.4,569.2H619v21h48.1v17.2H619v25.5h54.9v17.8h-75.1v-99.1h72.7V569.2z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/src/server/methods.js b/src/server/methods.js
index 427f0eb..6ee2927 100644
--- a/src/server/methods.js
+++ b/src/server/methods.js
@@ -3,22 +3,22 @@ Meteor.startup(function() {
 
 	// ###  Mail configuration  ###
 	process.env.MAIL_URL = 'smtp://'+Meteor.settings.mailAddress+':'+Meteor.settings.mailPassword+'@'+Meteor.settings.mailServer;          
-	Accounts.emailTemplates.from = "beekee.ch <vincent.widmer@beekee.ch>";
+	Accounts.emailTemplates.from = "Beekee Live <vincent.widmer@beekee.ch>";
 
 	// Reset Password mail configuration
 	Accounts.emailTemplates.resetPassword.text = function (user, url) {
- 		return "Hi, \n\n You recently requested to reset your password for your Beekee account.\n\n Click the link below to reset it. : \n"
+ 		return "Hi, \n\n You recently requested to reset your password for your Beekee Live account.\n\n Click the link below to reset it. : \n"
 		+ url
 		+ "\n\n If you did not requested a password reset, please ignore this email."
 		+ "\n\n Thanks,"
-		+ "\n\n Beekee Team";
+		+ "\n\n Beekee Live Team";
 	};
 	Accounts.emailTemplates.resetPassword.subject = function () {
- 		return "Reset your Beekee password";
+ 		return "Reset your Beekee Live password";
 	};
 
 	Accounts.urls.resetPassword = function(token) {
-		return 'http://web.beekee.ch/reset-password/' + token;
+		return 'http://live.beekee.ch/reset-password/' + token;
 	};
 });
 
@@ -37,7 +37,7 @@ Meteor.methods({
 			to: to,
 			from: from,
 			subject: subject,
-			text: text
+			html: text
 		});
 	},
 	'adminSetNewPassword': function(adminId, userId, newPassword) { // Admin can forcibly change the password for a user