diff --git a/production/calender.html b/production/calender.html
index 22572771..cc6c08d3 100755
--- a/production/calender.html
+++ b/production/calender.html
@@ -472,8 +472,7 @@
   <script src="js/bootstrap.min.js"></script>
 
   <script src="js/nprogress.js"></script>
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
+  
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/contacts.html b/production/contacts.html
index e9e9477d..84e570ec 100755
--- a/production/contacts.html
+++ b/production/contacts.html
@@ -734,8 +734,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/e_commerce.html b/production/e_commerce.html
index 95954bb8..60c1b93a 100755
--- a/production/e_commerce.html
+++ b/production/e_commerce.html
@@ -519,9 +519,7 @@
   </div>
 
   <script src="js/bootstrap.min.js"></script>
-
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
+  
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/empty.html b/production/empty.html
index 2138c4ee..458d4ec1 100644
--- a/production/empty.html
+++ b/production/empty.html
@@ -190,7 +190,7 @@
 	<!-- icheck -->
 	<script src="js/icheck/icheck.min.js"></script>
 	<!-- daterangepicker -->
-	<script type="text/javascript" src="js/moment.min.js"></script>
+	<script type="text/javascript" src="js/moment/moment.min.js"></script>
 	<script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
 
 	<script src="js/custom.js"></script>
diff --git a/production/form.html b/production/form.html
index 6a7e4f98..df23c496 100755
--- a/production/form.html
+++ b/production/form.html
@@ -1403,8 +1403,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@@ -1415,7 +1413,7 @@
   <!-- switchery -->
   <script src="js/switchery/switchery.min.js"></script>
   <!-- daterangepicker -->
-  <script type="text/javascript" src="js/moment.min2.js"></script>
+  <script type="text/javascript" src="js/moment/moment.min.js"></script>
   <script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
   <!-- richtext editor -->
   <script src="js/editor/bootstrap-wysiwyg.js"></script>
diff --git a/production/form_advanced.html b/production/form_advanced.html
index 8811b509..5e873a6a 100755
--- a/production/form_advanced.html
+++ b/production/form_advanced.html
@@ -1820,8 +1820,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/form_buttons.html b/production/form_buttons.html
index d6332628..a9d7a2b8 100755
--- a/production/form_buttons.html
+++ b/production/form_buttons.html
@@ -803,8 +803,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/form_upload.html b/production/form_upload.html
index bd24a929..74d5d789 100755
--- a/production/form_upload.html
+++ b/production/form_upload.html
@@ -400,8 +400,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/form_validation.html b/production/form_validation.html
index 5c19cb2a..896411a2 100755
--- a/production/form_validation.html
+++ b/production/form_validation.html
@@ -471,8 +471,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/form_wizards.html b/production/form_wizards.html
index 8e749802..1ed0942d 100755
--- a/production/form_wizards.html
+++ b/production/form_wizards.html
@@ -654,8 +654,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/general_elements.html b/production/general_elements.html
index 6ca18b44..b5847356 100755
--- a/production/general_elements.html
+++ b/production/general_elements.html
@@ -1673,8 +1673,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/glyphicons.html b/production/glyphicons.html
index f119426c..95c1fea6 100755
--- a/production/glyphicons.html
+++ b/production/glyphicons.html
@@ -1784,8 +1784,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/icons.html b/production/icons.html
index def30566..1897c524 100755
--- a/production/icons.html
+++ b/production/icons.html
@@ -2388,8 +2388,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/inbox.html b/production/inbox.html
index efb1ad96..9957d99c 100755
--- a/production/inbox.html
+++ b/production/inbox.html
@@ -590,8 +590,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/index.html b/production/index.html
index cd0681eb..c4e0c8ac 100755
--- a/production/index.html
+++ b/production/index.html
@@ -1096,16 +1096,16 @@
   <!-- gauge js -->
   <script type="text/javascript" src="js/gauge/gauge.min.js"></script>
   <script type="text/javascript" src="js/gauge/gauge_demo.js"></script>
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
   <!-- icheck -->
   <script src="js/icheck/icheck.min.js"></script>
   <!-- daterangepicker -->
-  <script type="text/javascript" src="js/moment.min.js"></script>
+  <script type="text/javascript" src="js/moment/moment.min.js"></script>
   <script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
+  <!-- chart js -->
+  <script src="js/chartjs/chart.min.js"></script>
 
   <script src="js/custom.js"></script>
 
diff --git a/production/index2.html b/production/index2.html
index 8395b675..d4f98206 100755
--- a/production/index2.html
+++ b/production/index2.html
@@ -813,15 +813,15 @@
   <script src="js/bootstrap.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <!-- icheck -->
   <script src="js/icheck/icheck.min.js"></script>
   <!-- daterangepicker -->
-  <script type="text/javascript" src="js/moment.min2.js"></script>
+  <script type="text/javascript" src="js/moment/moment.min.js"></script>
   <script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
+  <!-- chart js -->
+  <script src="js/chartjs/chart.min.js"></script>
   <!-- sparkline -->
   <script src="js/sparkline/jquery.sparkline.min.js"></script>
 
diff --git a/production/index3.html b/production/index3.html
index 1c003039..80777344 100755
--- a/production/index3.html
+++ b/production/index3.html
@@ -927,8 +927,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@@ -938,8 +936,10 @@
   <script type="text/javascript" src="js/gauge/gauge.min.js"></script>
   <script type="text/javascript" src="js/gauge/gauge_demo.js"></script>
   <!-- daterangepicker -->
-  <script type="text/javascript" src="js/moment.min2.js"></script>
+  <script type="text/javascript" src="js/moment/moment.min.js"></script>
   <script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
+  <!-- chart js -->
+  <script src="js/chartjs/chart.min.js"></script>
   <!-- sparkline -->
   <script src="js/sparkline/jquery.sparkline.min.js"></script>
 
@@ -1161,7 +1161,7 @@
 
   <!-- moris js -->
   <script src="js/moris/raphael-min.js"></script>
-  <script src="js/moris/morris.js"></script>
+  <script src="js/moris/morris.min.js"></script>
   <script>
     $(function() {
       var day_data = [{
diff --git a/production/invoice.html b/production/invoice.html
index da9d7991..e0b17c09 100755
--- a/production/invoice.html
+++ b/production/invoice.html
@@ -547,8 +547,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/media_gallery.html b/production/media_gallery.html
index 709d1af0..8aa51f43 100755
--- a/production/media_gallery.html
+++ b/production/media_gallery.html
@@ -586,8 +586,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/other_charts.html b/production/other_charts.html
index d40f5e28..549e3d65 100755
--- a/production/other_charts.html
+++ b/production/other_charts.html
@@ -504,6 +504,7 @@
   <script type="text/javascript" src="js/maps/jquery-jvectormap-us-aea-en.js"></script>
 
   <!-- chart js -->
+  <script src="js/moment/moment.min.js"></script>
   <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
diff --git a/production/page_404.html b/production/page_404.html
index 22a21ed8..c14e0364 100755
--- a/production/page_404.html
+++ b/production/page_404.html
@@ -82,8 +82,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/page_500.html b/production/page_500.html
index 0dfa96d9..6caab3a1 100755
--- a/production/page_500.html
+++ b/production/page_500.html
@@ -82,8 +82,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/plain_page.html b/production/plain_page.html
index 5b1b7536..30e7768d 100755
--- a/production/plain_page.html
+++ b/production/plain_page.html
@@ -389,8 +389,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@@ -399,10 +397,6 @@
 
   <script src="js/custom.js"></script>
 
-  <!-- moris js -->
-  <script src="js/moris/raphael-min.js"></script>
-  <script src="js/moris/morris.js"></script>
-  <script src="js/moris/example.js"></script>
   <!-- pace -->
   <script src="js/pace/pace.min.js"></script>
 
diff --git a/production/pricing_tables.html b/production/pricing_tables.html
index 9c1ecd51..c28f7e01 100755
--- a/production/pricing_tables.html
+++ b/production/pricing_tables.html
@@ -534,9 +534,7 @@
   </div>
 
   <script src="js/bootstrap.min.js"></script>
-
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
+  
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@@ -545,10 +543,6 @@
 
   <script src="js/custom.js"></script>
 
-  <!-- moris js -->
-  <script src="js/moris/raphael-min.js"></script>
-  <script src="js/moris/morris.js"></script>
-  <script src="js/moris/example.js"></script>
   <!-- pace -->
   <script src="js/pace/pace.min.js"></script>
 
diff --git a/production/profile.html b/production/profile.html
index 0be4879e..dd2a35ae 100755
--- a/production/profile.html
+++ b/production/profile.html
@@ -690,9 +690,7 @@
   </div>
 
   <script src="js/bootstrap.min.js"></script>
-
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
+  
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@@ -705,13 +703,16 @@
   <script src="js/cropping/cropper.min.js"></script>
   <script src="js/cropping/main.js"></script>
 
-
   <!-- daterangepicker -->
-  <script type="text/javascript" src="js/moment.min.js"></script>
+  <script type="text/javascript" src="js/moment/moment.min.js"></script>
   <script type="text/javascript" src="js/datepicker/daterangepicker.js"></script>
+
+  <!-- chart js -->
+  <script src="js/chartjs/chart.min.js"></script>
+
   <!-- moris js -->
   <script src="js/moris/raphael-min.js"></script>
-  <script src="js/moris/morris.js"></script>
+  <script src="js/moris/morris.min.js"></script>
 
   <!-- pace -->
   <script src="js/pace/pace.min.js"></script>
diff --git a/production/project_detail.html b/production/project_detail.html
index 56921aa8..ae891f59 100755
--- a/production/project_detail.html
+++ b/production/project_detail.html
@@ -526,8 +526,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/projects.html b/production/projects.html
index f635e4e3..3f1e1656 100755
--- a/production/projects.html
+++ b/production/projects.html
@@ -386,16 +386,16 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -424,10 +424,10 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -456,13 +456,13 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -491,16 +491,16 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -529,13 +529,13 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -564,16 +564,16 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -602,10 +602,10 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -634,13 +634,13 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -669,16 +669,16 @@
                         <td>
                           <ul class="list-inline">
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                             <li>
-                              <img src="http://localhost/personal/njoroge/assets3/img.jpg" class="avatar" alt="Avatar">
+                              <img src="images/user.png" class="avatar" alt="Avatar">
                             </li>
                           </ul>
                         </td>
@@ -732,8 +732,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/tables.html b/production/tables.html
index 6efa1c20..51d18cd3 100755
--- a/production/tables.html
+++ b/production/tables.html
@@ -798,8 +798,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/tables_dynamic.html b/production/tables_dynamic.html
index 610f16c5..c863071c 100755
--- a/production/tables_dynamic.html
+++ b/production/tables_dynamic.html
@@ -961,8 +961,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
@@ -1001,7 +999,7 @@
         "sPaginationType": "full_numbers",
         "dom": 'T<"clear">lfrtip',
         "tableTools": {
-          "sSwfPath": "<?php echo base_url('assets2/js/Datatables/tools/swf/copy_csv_xls_pdf.swf'); ?>"
+          "sSwfPath": "js/datatables/tools/swf/copy_csv_xls_pdf.swf"
         }
       });
       $("tfoot input").keyup(function() {
diff --git a/production/typography.html b/production/typography.html
index 295d14f2..79fb1ff4 100755
--- a/production/typography.html
+++ b/production/typography.html
@@ -428,8 +428,6 @@
 
   <script src="js/bootstrap.min.js"></script>
 
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
   <script src="js/nicescroll/jquery.nicescroll.min.js"></script>
diff --git a/production/widgets.html b/production/widgets.html
index 544f4b82..38c96aab 100755
--- a/production/widgets.html
+++ b/production/widgets.html
@@ -600,7 +600,7 @@
                                 </a>
                               </li>
                               <li>
-                                <img src="http://localhost/personal/njoroge/assets3/130.jpg" alt="..." class="img-circle profile_img">
+                                <img src="images/user.png" alt="..." class="img-circle profile_img">
                               </li>
                               <li>
                                 <a>
@@ -960,6 +960,7 @@
   <script src="js/bootstrap.min.js"></script>
 
   <!-- chart js -->
+  <script type="text/javascript" src="js/moment/moment.min.js"></script>
   <script src="js/chartjs/chart.min.js"></script>
   <!-- bootstrap progress js -->
   <script src="js/progressbar/bootstrap-progressbar.min.js"></script>
@@ -972,9 +973,6 @@
   <!-- pace -->
   <script src="js/pace/pace.min.js"></script>
 
-
-  <!-- chart js -->
-  <script src="js/chartjs/chart.min.js"></script>
   <!-- sparkline -->
   <script src="js/sparkline/jquery.sparkline.min.js"></script>
   <!-- easypie -->
@@ -1002,98 +1000,149 @@
   </script>
 
   <script>
-    var lineChartData = {
-      labels: ["", "", "", "", "", "", ""],
-      datasets: [{
-        label: "My First dataset",
-        fillColor: "rgba(38, 185, 154, 0.11)", //rgba(220,220,220,0.2)
-        strokeColor: "rgba(38, 185, 154, 0.7)", //rgba(220,220,220,1)
-        pointColor: "rgba(38, 185, 154, 0.7)", //rgba(220,220,220,1)
-        pointStrokeColor: "#fff",
-        pointHighlightFill: "#fff",
-        pointHighlightStroke: "rgba(220,220,220,1)",
-        data: [10, 30, 42, 23, 35, 55, 77]
-      }]
+    $(document).ready(function() {
+      Chart.defaults.global.legend = {
+        enabled: false
+      };
 
-    }
+      new Chart(document.getElementById("canvas_line"), {
+        type: 'line',
+        data: {
+          labels: ["January", "February", "March", "April", "May", "June", "July"],
+          datasets: [{
+            label: "My First dataset",
+            backgroundColor: "rgba(38, 185, 154, 0.31)",
+            borderColor: "rgba(38, 185, 154, 0.7)",
+            pointBorderColor: "rgba(38, 185, 154, 0.7)",
+            pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(220,220,220,1)",
+            pointBorderWidth: 1,
+            data: [31, 74, 6, 39, 20, 85, 7]
+          }, {
+            label: "My Second dataset",
+            backgroundColor: "rgba(3, 88, 106, 0.3)",
+            borderColor: "rgba(3, 88, 106, 0.70)",
+            pointBorderColor: "rgba(3, 88, 106, 0.70)",
+            pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(151,187,205,1)",
+            pointBorderWidth: 1,
+            data: [82, 23, 66, 9, 99, 4, 2]
+          }]
+        },
+      });
 
-    $(document).ready(function() {
-      new Chart(document.getElementById("canvas_line").getContext("2d")).Line(lineChartData, {
-        responsive: true,
-        scaleShowLabels: false,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
+      new Chart(document.getElementById("canvas_line1"), {
+        type: 'line',
+        data: {
+          labels: ["January", "February", "March", "April", "May", "June", "July"],
+          datasets: [{
+            label: "My First dataset",
+            backgroundColor: "rgba(38, 185, 154, 0.31)",
+            borderColor: "rgba(38, 185, 154, 0.7)",
+            pointBorderColor: "rgba(38, 185, 154, 0.7)",
+            pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(220,220,220,1)",
+            pointBorderWidth: 1,
+            data: [31, 74, 6, 39, 20, 85, 7]
+          }, {
+            label: "My Second dataset",
+            backgroundColor: "rgba(3, 88, 106, 0.3)",
+            borderColor: "rgba(3, 88, 106, 0.70)",
+            pointBorderColor: "rgba(3, 88, 106, 0.70)",
+            pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(151,187,205,1)",
+            pointBorderWidth: 1,
+            data: [82, 23, 66, 9, 99, 4, 2]
+          }]
+        },
       });
-    });
-    $(document).ready(function() {
-      new Chart(document.getElementById("canvas_line1").getContext("2d")).Line(lineChartData, {
-        responsive: true,
-        scaleShowLabels: false,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
-      });
-    });
-    $(document).ready(function() {
-      new Chart(document.getElementById("canvas_line2").getContext("2d")).Line(lineChartData, {
-        responsive: true,
-        scaleShowLabels: false,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
-      });
-    });
-    $(document).ready(function() {
-      new Chart(document.getElementById("canvas_line3").getContext("2d")).Line(lineChartData, {
-        responsive: true,
-        scaleShowLabels: false,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
-      });
-    });
-    $(document).ready(function() {
-      new Chart(document.getElementById("canvas_line4").getContext("2d")).Line(lineChartData, {
-        responsive: true,
-        scaleShowLabels: false,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
-      });
-    });
 
-    var sharePiePolorDoughnutData = [{
-      value: 125,
-      color: "rgba(38, 185, 154, 0.7)",
-      highlight: "rgba(38, 185, 154, 0.7)",
-      label: ""
-    }, {
-      value: 25,
-      color: "rgba(38, 185, 154, 0.01)",
-      highlight: "rgba(38, 185, 154, 0.01)",
-      label: ""
-    }];
-    $(document).ready(function() {
-      window.myDoughnut = new Chart(document.getElementById("canvas_doughnut").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
-        responsive: true,
-        scaleShowLabels: false,
-        segmentStrokeWidth: 2,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
+      new Chart(document.getElementById("canvas_line2"), {
+        type: 'line',
+        data: {
+          labels: ["January", "February", "March", "April", "May", "June", "July"],
+          datasets: [{
+            label: "My First dataset",
+            backgroundColor: "rgba(38, 185, 154, 0.31)",
+            borderColor: "rgba(38, 185, 154, 0.7)",
+            pointBorderColor: "rgba(38, 185, 154, 0.7)",
+            pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(220,220,220,1)",
+            pointBorderWidth: 1,
+            data: [31, 74, 6, 39, 20, 85, 7]
+          }, {
+            label: "My Second dataset",
+            backgroundColor: "rgba(3, 88, 106, 0.3)",
+            borderColor: "rgba(3, 88, 106, 0.70)",
+            pointBorderColor: "rgba(3, 88, 106, 0.70)",
+            pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(151,187,205,1)",
+            pointBorderWidth: 1,
+            data: [82, 23, 66, 9, 99, 4, 2]
+          }]
+        },
       });
-    });
-    $(document).ready(function() {
-      window.myDoughnut = new Chart(document.getElementById("canvas_doughnut2").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
-        responsive: true,
-        scaleShowLabels: false,
-        segmentStrokeWidth: 2,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
+
+      new Chart(document.getElementById("canvas_line3"), {
+        type: 'line',
+        data: {
+          labels: ["January", "February", "March", "April", "May", "June", "July"],
+          datasets: [{
+            label: "My First dataset",
+            backgroundColor: "rgba(38, 185, 154, 0.31)",
+            borderColor: "rgba(38, 185, 154, 0.7)",
+            pointBorderColor: "rgba(38, 185, 154, 0.7)",
+            pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(220,220,220,1)",
+            pointBorderWidth: 1,
+            data: [31, 74, 6, 39, 20, 85, 7]
+          }, {
+            label: "My Second dataset",
+            backgroundColor: "rgba(3, 88, 106, 0.3)",
+            borderColor: "rgba(3, 88, 106, 0.70)",
+            pointBorderColor: "rgba(3, 88, 106, 0.70)",
+            pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(151,187,205,1)",
+            pointBorderWidth: 1,
+            data: [82, 23, 66, 9, 99, 4, 2]
+          }]
+        },
       });
-    });
-    $(document).ready(function() {
-      window.myDoughnut = new Chart(document.getElementById("canvas_doughnut3").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
-        responsive: true,
-        scaleShowLabels: false,
-        segmentStrokeWidth: 2,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
-      });
-    });
-    $(document).ready(function() {
-      window.myDoughnut = new Chart(document.getElementById("canvas_doughnut4").getContext("2d")).Doughnut(sharePiePolorDoughnutData, {
-        responsive: true,
-        scaleShowLabels: false,
-        segmentStrokeWidth: 2,
-        tooltipFillColor: "rgba(51, 51, 51, 0.55)"
+
+      new Chart(document.getElementById("canvas_line4"), {
+        type: 'line',
+        data: {
+          labels: ["January", "February", "March", "April", "May", "June", "July"],
+          datasets: [{
+            label: "My First dataset",
+            backgroundColor: "rgba(38, 185, 154, 0.31)",
+            borderColor: "rgba(38, 185, 154, 0.7)",
+            pointBorderColor: "rgba(38, 185, 154, 0.7)",
+            pointBackgroundColor: "rgba(38, 185, 154, 0.7)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(220,220,220,1)",
+            pointBorderWidth: 1,
+            data: [31, 74, 6, 39, 20, 85, 7]
+          }, {
+            label: "My Second dataset",
+            backgroundColor: "rgba(3, 88, 106, 0.3)",
+            borderColor: "rgba(3, 88, 106, 0.70)",
+            pointBorderColor: "rgba(3, 88, 106, 0.70)",
+            pointBackgroundColor: "rgba(3, 88, 106, 0.70)",
+            pointHoverBackgroundColor: "#fff",
+            pointHoverBorderColor: "rgba(151,187,205,1)",
+            pointBorderWidth: 1,
+            data: [82, 23, 66, 9, 99, 4, 2]
+          }]
+        },
       });
     });
   </script>