diff --git a/lang/hi/lang.php b/lang/hi/lang.php
index d609c64..2ad2ae0 100644
--- a/lang/hi/lang.php
+++ b/lang/hi/lang.php
@@ -70,5 +70,6 @@
     'notifications' => 'सूचनाएं',
     'activities' => 'गतिविधियां',
     'superadmin' => 'सुपर व्यवस्थापक',
-    'change-password' => 'पासवर्ड बदलें'
+    'change-password' => 'पासवर्ड बदलें',
+    'are-you-sure-you-want-to-delete-activities' => 'Are you sure you want to delete <strong>Activities</strong>',
 ];
diff --git a/resources/views/admin/activities.blade.php b/resources/views/admin/activities.blade.php
index cabc54a..72a390d 100644
--- a/resources/views/admin/activities.blade.php
+++ b/resources/views/admin/activities.blade.php
@@ -67,7 +67,7 @@
 @section('script')
 <script>
 	function delete_activity(){
-		kchat_alert("Are you sure you want to delete <strong>Activities</strong>?",(function(){__post('/activity/delete',{'ids':getSelectedID()});}));
+		kchat_alert("{{ __("lang.are-you-sure-you-want-to-delete-activities") }}",(function(){__post('/activity/delete',{'ids':getSelectedID()});}));
 	}
 </script>
 @endsection
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 235b3e5..ce0093d 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -120,7 +120,7 @@
       labels: @json($dates),
       datasets: [{
         responsive: true,
-        label: 'All message\'s per day',
+        label: '{{ __('lang.all-messages-per-day') }}',
         data: @json($new_messages_perday),
         borderWidth: 1
       }]
@@ -145,7 +145,7 @@
       labels: @json($dates),
       datasets: [{
         responsive: true,
-        label: 'All user\'s per day',
+        label: '{{ __('lang.all-users-per-day') }}',
         data: @json($new_users_perday),
         borderWidth: 1
       }]
@@ -170,7 +170,7 @@
       labels: @json($dates),
       datasets: [{
         responsive: true,
-        label: 'All conversation\'s per day',
+        label: '{{ __('lang.all-conversations-per-day') }}',
         data: @json($new_conversations_perday),
         borderWidth: 1
       }]
@@ -195,7 +195,7 @@
       labels: @json($dates),
       datasets: [{
         responsive: true,
-        label: 'All your message\'s per day',
+        label: '{{ __('lang.all-your-messages-per-day') }}',
         data: @json($current_user_new_messages_perday),
         borderWidth: 1
       }]
@@ -220,7 +220,7 @@
       labels: @json($dates),
       datasets: [{
         responsive: true,
-        label: 'All your conversation\'s per day',
+        label: '{{ __('lang.all-your-conversations-per-day') }}',
         data: @json($current_user_new_conversations_perday),
         borderWidth: 1
       }]
diff --git a/resources/views/admin/members.blade.php b/resources/views/admin/members.blade.php
index cab17e3..f52abf8 100644
--- a/resources/views/admin/members.blade.php
+++ b/resources/views/admin/members.blade.php
@@ -33,7 +33,7 @@
                   <a class="dropdown-item" onclick="SelectAll()" >{{ __("lang.select-all") }}</a>
                   <a class="dropdown-item" onclick="delete_users()" >{{ __("lang.delete") }}</a>
                   <a class="dropdown-item" onclick="set_inactive_users()" >{{ __("lang.set-inactive") }}</a>
-                  <a class="dropdown-item" onclick="set_active_users()" >Set Active</a>
+                  <a class="dropdown-item" onclick="set_active_users()" >{{ __("lang.set-active") }}</a>
                   <a class="dropdown-item" onclick="block_users()" >{{ __("lang.block") }}</a>
                   <a class="dropdown-item" onclick="unblock_users()" >{{ __("lang.unblock") }}</a>
                   <a class="dropdown-item" onclick="make_admins()" >{{ __("lang.make-admin") }}</a>
@@ -106,7 +106,7 @@
 				  <input type="hidden" value="" id="m_user" />
                   <a class="dropdown-item" onclick="delete_user()" >{{ __("lang.delete") }}</a>
                   <a class="dropdown-item" onclick="set_inactive_user()" >{{ __("lang.set-inactive") }}</a>
-                  <a class="dropdown-item" onclick="set_active_user()" >Set Active</a>
+                  <a class="dropdown-item" onclick="set_active_user()" >{{ __("lang.set-active") }}</a>
                   <a class="dropdown-item" onclick="block_user()" >{{ __("lang.block") }}</a>
                   <a class="dropdown-item" onclick="unblock_user()" >{{ __("lang.unblock") }}</a>
                   <a class="dropdown-item" onclick="make_admin()" >{{ __("lang.make-admin") }}</a>
diff --git a/resources/views/common/msg.blade.php b/resources/views/common/msg.blade.php
index 8e2dbf8..139983b 100644
--- a/resources/views/common/msg.blade.php
+++ b/resources/views/common/msg.blade.php
@@ -1,6 +1,6 @@
 @extends('admin.master')
 
-@section('title', 'Message\'s')
+@section('title', __("lang.messages"))
 
 @section('header')
 	<link href="/css/bootstrap.min.css" rel="stylesheet">
@@ -47,7 +47,7 @@
  </div>
  <div class="chat-history" id="Msgs" style="min-height: 50%;" >
     <image id="loading" src="/assets/loading.gif"/>
-	<ul class="pl-3 pr-3" id="{{ __("lang.messages") }}"></ul>
+	<ul class="pl-3 pr-3" id="Messages"></ul>
     <button type="button" id="gotobottom" class="btn btn-outline-secondary"><i class="fa fa-chevron-down"></i></button>
  </div>
  <div class="chat-message clearfix">
@@ -161,7 +161,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __("lang.close") }}</button>
-        <button type="button" class="btn btn-primary" id="{{ __("lang.whiteboard") }}{{ __("lang.send") }}" data-dismiss="modal">{{ __("lang.send") }}</button>
+        <button type="button" class="btn btn-primary" id="WhiteBoardSend" data-dismiss="modal">{{ __("lang.send") }}</button>
       </div>
     </div>
   </div>
@@ -171,7 +171,7 @@
 @section('script')
 <script type="text/javascript">
 
-var shape,fill,points=[],x=y=0,c=document.getElementById("myCanvas"),ctx=c.getContext("2d"),color="#000000",border=1;function getMousePos(e,t){var n=e.getBoundingClientRect();x=t.clientX-n.left,y=t.clientY-n.top}function _wb_event(e,t){}function F_Points(){void 0!=shape&&(points[points.length]=[shape,color,border,[[x,y]]])}var tmp=0;function T_Points(){"Pencil"==shape||"bezier"==shape?(tmp=points[points.length-1][3].length,points[points.length-1][1]=color,points[points.length-1][2]=border,points[points.length-1][3][tmp]=[x,y]):void 0!=shape&&(points[points.length-1][1]=color,points[points.length-1][2]=border,points[points.length-1][3][0][2]=x,points[points.length-1][3][0][3]=y,points[points.length-1][4]=fill)}function Color(e){color=e.value}function bordersize(e){border=e.value}function filled(e){fill=e.checked}function draw(e,t){ctx.beginPath(),ctx.lineWidth=e[2],ctx.fillStyle=e[1],ctx.strokeStyle=e[1],"Line"==e[0]&&(ctx.moveTo(e[3][0][0],e[3][0][1]),ctx.lineTo(e[3][0][2],e[3][0][3])),"Circle"==e[0]&&ctx.arc(e[3][0][0],e[3][0][1],Math.sqrt((e[3][0][2]-e[3][0][0])*(e[3][0][2]-e[3][0][0])+(e[3][0][3]-e[3][0][1])*(e[3][0][3]-e[3][0][1])),0,2*Math.PI),"Rectangle"==e[0]&&(e[4]?ctx.fillRect(e[3][0][0],e[3][0][1],e[3][0][2]-e[3][0][0],e[3][0][3]-e[3][0][1]):ctx.strokeRect(e[3][0][0],e[3][0][1],e[3][0][2]-e[3][0][0],e[3][0][3]-e[3][0][1])),"clearRect"==e[0]&&ctx.clearRect(e[3][0][0],e[3][0][1],e[3][0][2]-e[3][0][0],e[3][0][3]-e[3][0][1]),"ellipse"==e[0]&&ctx.ellipse(e[3][0][0],e[3][0][1],Math.abs(e[3][0][2]-e[3][0][0]),Math.abs(e[3][0][3]-e[3][0][1]),0,0,2*Math.PI,!1),"Pencil"==e[0]&&(ctx.moveTo(e[3][0][0],e[3][0][1]),e[3].forEach(e=>{ctx.lineTo(e[0],e[1])})),"bezier"==e[0]&&(ctx.moveTo(e[3][0][0],e[3][0][1]),e[3].forEach(e=>{ctx.bezierCurveTo(e[0],e[1])})),e[4]&&ctx.fill(),ctx.stroke()}var go=!1;function buttons(e){shape=e.getAttribute("data")}function Clear(){points=[],ctx.clearRect(0,0,c.width,c.height)}function download(){let e=document.getElementById("myCanvas"),t=document.createElement("a"),n=e.toDataURL();t.href=n,t.download="KChat-{{ __("lang.whiteboard") }}.png",t.click()}function download_json(){let e=JSON.stringify(points),t=btoa(e),n=document.createElement("a");n.href="data:text/plain;base64,"+t,n.download="KChat-{{ __("lang.whiteboard") }}.json",n.click()}c.addEventListener("drag",function(e){_wb_event(e,"drag")},!1),c.addEventListener("click",function(e){_wb_event(e,"click")},!1),c.addEventListener("drop",function(e){_wb_event(e,"drop")},!1),c.addEventListener("keydown",function(e){_wb_event(e,"keydown")},!1),c.addEventListener("keypress",function(e){_wb_event(e,"keypress")},!1),c.addEventListener("keyup",function(e){_wb_event(e,"keyup")},!1),c.addEventListener("mousedown",function(e){_wb_event(e,"mousedown"),F_Points(),go=!0},!1),c.addEventListener("mouseenter",function(e){_wb_event(e,"mouseenter")},!1),c.addEventListener("mouseleave",function(e){_wb_event(e,"mouseleave")},!1),c.addEventListener("mousemove",function(e){_wb_event(e,"mousemove"),getMousePos(c,e),go&&(ctx.clearRect(0,0,c.width,c.height),points.forEach(draw),T_Points())},!1),c.addEventListener("mouseover",function(e){_wb_event(e,"mouseover")},!1),c.addEventListener("mouseout",function(e){_wb_event(e,"mouseout")},!1),c.addEventListener("mouseup",function(e){_wb_event(e,"mouseup"),T_Points(),go=!1,points.forEach(draw)},!1),c.addEventListener("mousewheel",function(e){_wb_event(e,"mousewheel")},!1),c.addEventListener("offline",function(e){_wb_event(e,"offline")},!1),c.addEventListener("online",function(e){_wb_event(e,"online")},!1);
+var shape,fill,points=[],x=y=0,c=document.getElementById("myCanvas"),ctx=c.getContext("2d"),color="#000000",border=1;function getMousePos(e,t){var n=e.getBoundingClientRect();x=t.clientX-n.left,y=t.clientY-n.top}function _wb_event(e,t){}function F_Points(){void 0!=shape&&(points[points.length]=[shape,color,border,[[x,y]]])}var tmp=0;function T_Points(){"Pencil"==shape||"bezier"==shape?(tmp=points[points.length-1][3].length,points[points.length-1][1]=color,points[points.length-1][2]=border,points[points.length-1][3][tmp]=[x,y]):void 0!=shape&&(points[points.length-1][1]=color,points[points.length-1][2]=border,points[points.length-1][3][0][2]=x,points[points.length-1][3][0][3]=y,points[points.length-1][4]=fill)}function Color(e){color=e.value}function bordersize(e){border=e.value}function filled(e){fill=e.checked}function draw(e,t){ctx.beginPath(),ctx.lineWidth=e[2],ctx.fillStyle=e[1],ctx.strokeStyle=e[1],"Line"==e[0]&&(ctx.moveTo(e[3][0][0],e[3][0][1]),ctx.lineTo(e[3][0][2],e[3][0][3])),"Circle"==e[0]&&ctx.arc(e[3][0][0],e[3][0][1],Math.sqrt((e[3][0][2]-e[3][0][0])*(e[3][0][2]-e[3][0][0])+(e[3][0][3]-e[3][0][1])*(e[3][0][3]-e[3][0][1])),0,2*Math.PI),"Rectangle"==e[0]&&(e[4]?ctx.fillRect(e[3][0][0],e[3][0][1],e[3][0][2]-e[3][0][0],e[3][0][3]-e[3][0][1]):ctx.strokeRect(e[3][0][0],e[3][0][1],e[3][0][2]-e[3][0][0],e[3][0][3]-e[3][0][1])),"clearRect"==e[0]&&ctx.clearRect(e[3][0][0],e[3][0][1],e[3][0][2]-e[3][0][0],e[3][0][3]-e[3][0][1]),"ellipse"==e[0]&&ctx.ellipse(e[3][0][0],e[3][0][1],Math.abs(e[3][0][2]-e[3][0][0]),Math.abs(e[3][0][3]-e[3][0][1]),0,0,2*Math.PI,!1),"Pencil"==e[0]&&(ctx.moveTo(e[3][0][0],e[3][0][1]),e[3].forEach(e=>{ctx.lineTo(e[0],e[1])})),"bezier"==e[0]&&(ctx.moveTo(e[3][0][0],e[3][0][1]),e[3].forEach(e=>{ctx.bezierCurveTo(e[0],e[1])})),e[4]&&ctx.fill(),ctx.stroke()}var go=!1;function buttons(e){shape=e.getAttribute("data")}function Clear(){points=[],ctx.clearRect(0,0,c.width,c.height)}function download(){let e=document.getElementById("myCanvas"),t=document.createElement("a"),n=e.toDataURL();t.href=n,t.download="KChat-whiteboard.png",t.click()}function download_json(){let e=JSON.stringify(points),t=btoa(e),n=document.createElement("a");n.href="data:text/plain;base64,"+t,n.download="KChat-whiteboard.json",n.click()}c.addEventListener("drag",function(e){_wb_event(e,"drag")},!1),c.addEventListener("click",function(e){_wb_event(e,"click")},!1),c.addEventListener("drop",function(e){_wb_event(e,"drop")},!1),c.addEventListener("keydown",function(e){_wb_event(e,"keydown")},!1),c.addEventListener("keypress",function(e){_wb_event(e,"keypress")},!1),c.addEventListener("keyup",function(e){_wb_event(e,"keyup")},!1),c.addEventListener("mousedown",function(e){_wb_event(e,"mousedown"),F_Points(),go=!0},!1),c.addEventListener("mouseenter",function(e){_wb_event(e,"mouseenter")},!1),c.addEventListener("mouseleave",function(e){_wb_event(e,"mouseleave")},!1),c.addEventListener("mousemove",function(e){_wb_event(e,"mousemove"),getMousePos(c,e),go&&(ctx.clearRect(0,0,c.width,c.height),points.forEach(draw),T_Points())},!1),c.addEventListener("mouseover",function(e){_wb_event(e,"mouseover")},!1),c.addEventListener("mouseout",function(e){_wb_event(e,"mouseout")},!1),c.addEventListener("mouseup",function(e){_wb_event(e,"mouseup"),T_Points(),go=!1,points.forEach(draw)},!1),c.addEventListener("mousewheel",function(e){_wb_event(e,"mousewheel")},!1),c.addEventListener("offline",function(e){_wb_event(e,"offline")},!1),c.addEventListener("online",function(e){_wb_event(e,"online")},!1);
 
 </script>
 @endsection
diff --git a/resources/views/user/dashboard.blade.php b/resources/views/user/dashboard.blade.php
index 267be27..e0be599 100644
--- a/resources/views/user/dashboard.blade.php
+++ b/resources/views/user/dashboard.blade.php
@@ -63,8 +63,8 @@
       labels: @json($dates),
       datasets: [{
         responsive: true,
-        label: 'All your message\'s per day',
-        data: @json($current_user_new_conversations_perday),
+        label: '{{ __('lang.all-your-messages-per-day') }}',
+        data: @json($current_user_new_messages_perday),
         borderWidth: 1
       }]
     },
@@ -88,8 +88,8 @@
       labels: @json($dates),
       datasets: [{
         responsive: true,
-        label: 'All your conversation\'s per day',
-        data: @json($current_user_new_messages_perday),
+        label: '{{ __('lang.all-your-conversations-per-day') }}',
+        data: @json($current_user_new_conversations_perday),
         borderWidth: 1
       }]
     },