diff --git a/src/index.html b/src/index.html
index 15ba0f359..99014119a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -21,14 +21,26 @@
         "path": "."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Dashboard"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Dashboard</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <div class="content">
           <div class="container-fluid">
             <!-- Small boxes (Stat box) -->
-            <div class="row">
+            <section class="row">
               <div class="col-lg-3 col-6">
                 <!-- small box -->
                 <div class="small-box bg-primary">
@@ -89,10 +101,10 @@
                 </div>
               </div>
               <!-- ./col -->
-            </div>
+            </section>
             <!-- /.row -->
             <!-- Main row -->
-            <div class="row">
+            <section class="row">
               <!-- Start col -->
               <section class="col-lg-7">
                 <!-- Custom tabs (Charts with tabs)-->
@@ -331,11 +343,11 @@
                 <!--/.direct-chat -->
               </section>
               <!-- /.Start col -->
-            </div>
+            </section>
             <!-- /.row (main row) -->
           </div><!-- /.container-fluid -->
         </div>
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/index2.html b/src/index2.html
index 6a525a3cb..156962a55 100644
--- a/src/index2.html
+++ b/src/index2.html
@@ -20,14 +20,26 @@
         "path": "."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Dashboard v2"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Dashboard v2</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Dashboard v2</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <div class="content">
           <div class="container-fluid">
             <!-- Info boxes -->
-            <div class="row">
+            <section class="row">
               <div class="col-12 col-sm-6 col-md-3">
                 <div class="info-box">
                   <span class="info-box-icon bg-primary shadow-sm"><i class="fas fa-cog"></i></span>
@@ -87,10 +99,10 @@
                 <!-- /.info-box -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
 
-            <div class="row">
+            <section class="row">
               <div class="col-md-12">
                 <div class="card">
                   <div class="card-header">
@@ -119,7 +131,7 @@
                   </div>
                   <!-- /.card-header -->
                   <div class="card-body">
-                    <div class="row">
+                    <section class="row">
                       <div class="col-md-8">
                         <p class="text-center">
                           <strong>Sales: 1 Jan, 2014 - 30 Jul, 2014</strong>
@@ -174,12 +186,12 @@
                         <!-- /.progress-group -->
                       </div>
                       <!-- /.col -->
-                    </div>
+                    </section>
                     <!-- /.row -->
                   </div>
                   <!-- ./card-body -->
                   <div class="card-footer">
-                    <div class="row">
+                    <section class="row">
                       <div class="col-sm-3 col-6">
                         <div class="description-block border-end">
                           <span class="description-percentage text-success"><i class="fas fa-caret-up"></i> 17%</span>
@@ -215,7 +227,7 @@
                         </div>
                         <!-- /.description-block -->
                       </div>
-                    </div>
+                    </section>
                     <!-- /.row -->
                   </div>
                   <!-- /.card-footer -->
@@ -223,14 +235,14 @@
                 <!-- /.card -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
 
             <!-- Main row -->
-            <div class="row">
+            <section class="row">
               <!-- Start col -->
               <div class="col-md-8">
-                <div class="row">
+                <section class="row">
                   <div class="col-md-6">
                     <!-- DIRECT CHAT -->
                     <div class="card direct-chat direct-chat-warning">
@@ -507,7 +519,7 @@
                     <!--/.card -->
                   </div>
                   <!-- /.col -->
-                </div>
+                </section>
                 <!-- /.row -->
 
                 <!-- TABLE: LATEST ORDERS -->
@@ -667,7 +679,7 @@
                   </div>
                   <!-- /.card-header -->
                   <div class="card-body">
-                    <div class="row">
+                    <section class="row">
                       <div class="col-md-8">
                         <div class="chart-responsive">
                           <canvas id="pieChart" height="150"></canvas>
@@ -686,7 +698,7 @@
                         </ul>
                       </div>
                       <!-- /.col -->
-                    </div>
+                    </section>
                     <!-- /.row -->
                   </div>
                   <!-- /.card-body -->
@@ -741,7 +753,7 @@
                     <ul class="products-list product-list-in-card ps-2 pe-2">
                       <li class="item">
                         <div class="product-img">
-                          <img src="./assets/img/user3-128x128.jpg " alt="Product Image" class="img-size-50">
+                          <img src="./assets/img/default-150x150.png" alt="Product Image" class="img-size-50">
                         </div>
                         <div class="product-info">
                           <a href="javascript:void(0)" class="product-title">Samsung TV
@@ -754,7 +766,7 @@
                       <!-- /.item -->
                       <li class="item">
                         <div class="product-img">
-                          <img src="./assets/img/user3-128x128.jpg " alt="Product Image" class="img-size-50">
+                          <img src="./assets/img/default-150x150.png" alt="Product Image" class="img-size-50">
                         </div>
                         <div class="product-info">
                           <a href="javascript:void(0)" class="product-title">Bicycle
@@ -767,7 +779,7 @@
                       <!-- /.item -->
                       <li class="item">
                         <div class="product-img">
-                          <img src="./assets/img/user3-128x128.jpg " alt="Product Image" class="img-size-50">
+                          <img src="./assets/img/default-150x150.png" alt="Product Image" class="img-size-50">
                         </div>
                         <div class="product-info">
                           <a href="javascript:void(0)" class="product-title">
@@ -783,7 +795,7 @@
                       <!-- /.item -->
                       <li class="item">
                         <div class="product-img">
-                          <img src="./assets/img/user3-128x128.jpg " alt="Product Image" class="img-size-50">
+                          <img src="./assets/img/default-150x150.png" alt="Product Image" class="img-size-50">
                         </div>
                         <div class="product-info">
                           <a href="javascript:void(0)" class="product-title">PlayStation 4
@@ -805,11 +817,11 @@
                 <!-- /.card -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
           </div><!-- /.container-fluid -->
         </div>
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/index3.html b/src/index3.html
index 4a61c263e..33b9b1acb 100644
--- a/src/index3.html
+++ b/src/index3.html
@@ -21,13 +21,25 @@
         "path": "."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Dashboard v3"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Dashboard v3</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Dashboard v3</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <div class="content">
           <div class="container-fluid">
-            <div class="row">
+            <section class="row">
               <div class="col-lg-6">
                 <div class="card">
                   <div class="card-header border-0">
@@ -268,11 +280,11 @@
                 </div>
               </div>
               <!-- /.col-md-6 -->
-            </div>
+            </section>
             <!-- /.row -->
           </div><!-- /.container-fluid -->
         </div>
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/pages/examples/login.html b/src/pages/examples/login.html
index c14ea895a..89f00e8e2 100644
--- a/src/pages/examples/login.html
+++ b/src/pages/examples/login.html
@@ -32,7 +32,7 @@
                 <span class="fas fa-lock"></span>
               </div>
             </div>
-            <div class="row">
+            <section class="row">
               <div class="col-8">
                 <div class="form-check">
                   <input class="form-check-input" type="checkbox" value="" id="flexCheckDefault">
@@ -48,7 +48,7 @@
                 </div>
               </div>
               <!-- /.col -->
-            </div>
+            </section>
           </form>
 
           <div class="social-auth-links text-center mb-3 d-grid gap-2">
diff --git a/src/pages/forms/general.html b/src/pages/forms/general.html
index bd6c089d5..d2a9d1efd 100644
--- a/src/pages/forms/general.html
+++ b/src/pages/forms/general.html
@@ -20,14 +20,26 @@
         "path": "../.."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "General Form"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">General Form</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">General Form</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <!-- Main content -->
         <div class="content">
           <div class="container-fluid">
-            <div class="row g-4">
+            <section class="row g-4">
               <!-- Start column -->
               <div class="col-md-6">
                 <!-- general form elements -->
@@ -64,12 +76,12 @@
                 </div>
                 <!-- /.card -->
               </div>
-            </div>
+            </section>
             <!-- /.row -->
           </div><!-- /.container-fluid -->
         </div>
         <!-- /.content -->
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/pages/layout/fixed-sidebar.html b/src/pages/layout/fixed-sidebar.html
index 2c5bee894..0ea22de0e 100644
--- a/src/pages/layout/fixed-sidebar.html
+++ b/src/pages/layout/fixed-sidebar.html
@@ -20,14 +20,26 @@
         "path": "../.."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Fixed Layout"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Fixed Layout</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Fixed Layout</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <!-- Main content -->
         <div class="content">
           <div class="container-fluid">
-            <div class="row">
+            <section class="row">
               <div class="col-12">
                 <!-- Default box -->
                 <div class="card">
@@ -54,12 +66,12 @@
                 </div>
                 <!-- /.card -->
               </div>
-            </div>
+            </section>
             <!-- /.row -->
           </div><!-- /.container-fluid -->
         </div>
         <!-- /.content -->
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/pages/tables/simple.html b/src/pages/tables/simple.html
index 62d2a284a..c86de2852 100644
--- a/src/pages/tables/simple.html
+++ b/src/pages/tables/simple.html
@@ -20,14 +20,26 @@
         "path": "../.."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Simple Tables"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Simple Tables</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Simple Tables</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <!-- Main content -->
         <div class="content">
           <div class="container-fluid">
-            <div class="row">
+            <section class="row">
               <div class="col-md-6">
                 <div class="card">
                   <div class="card-header">
@@ -303,12 +315,12 @@
                 <!-- /.card -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
           </div><!-- /.container-fluid -->
         </div>
         <!-- /.content -->
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/pages/widgets/cards.html b/src/pages/widgets/cards.html
index d18b38a9d..e0d22b3a1 100644
--- a/src/pages/widgets/cards.html
+++ b/src/pages/widgets/cards.html
@@ -20,16 +20,28 @@
         "path": "../.."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Widgets - Cards"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Cards</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Cards</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <!-- Main content -->
         <div class="content">
           <div class="container-fluid">
             <h4 class="mb-2 mt-4">Cards</h4>
             <h5 class="mb-2">Abilities</h5>
-            <div class="row">
+            <section class="row">
               <div class="col-md-3">
                 <div class="card card-primary collapsed-card">
                   <div class="card-header">
@@ -110,12 +122,12 @@
                 <!-- /.card -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
           </div><!-- /.container-fluid -->
         </div>
         <!-- /.content -->
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/pages/widgets/info-box.html b/src/pages/widgets/info-box.html
index ac2bc8474..383600fc8 100644
--- a/src/pages/widgets/info-box.html
+++ b/src/pages/widgets/info-box.html
@@ -21,15 +21,27 @@
         "path": "../.."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Widgets - Info Box"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Info Box</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Info Box</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <!-- Main content -->
         <div class="content">
           <div class="container-fluid">
             <h5 class="mb-2">Info Box</h5>
-            <div class="row">
+            <section class="row">
               <div class="col-12 col-sm-6 col-md-3">
                 <div class="info-box">
                   <span class="info-box-icon bg-primary shadow-sm"><i class="fas fa-cog"></i></span>
@@ -91,12 +103,12 @@
                 <!-- /.info-box -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
 
             <!-- =========================================================== -->
             <h5 class="mb-2">Info Box With Custom Shadows <small><i>Using Bootstrap's Shadow Utility</i></small></h5>
-            <div class="row">
+            <section class="row">
               <div class="col-12 col-sm-6 col-md-3">
                 <div class="info-box shadow-none">
                   <span class="info-box-icon bg-primary shadow-sm"><i class="fas fa-cog"></i></span>
@@ -158,12 +170,12 @@
                 <!-- /.info-box -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
 
             <!-- =========================================================== -->
             <h5 class="mt-4 mb-2">Info Box With <code>bg-*</code></h5>
-            <div class="row">
+            <section class="row">
               <div class="col-md-3 col-sm-6 col-12">
                 <div class="info-box bg-primary">
                   <span class="info-box-icon"><i class="far fa-bookmark"></i></span>
@@ -244,12 +256,12 @@
                 <!-- /.info-box -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
 
             <!-- =========================================================== -->
             <h5 class="mt-4 mb-2">Info Box With <code>bg-gradient</code></h5>
-            <div class="row">
+            <section class="row">
               <div class="col-md-3 col-sm-6 col-12">
                 <div class="info-box bg-primary bg-gradient">
                   <span class="info-box-icon"><i class="far fa-bookmark"></i></span>
@@ -330,12 +342,12 @@
                 <!-- /.info-box -->
               </div>
               <!-- /.col -->
-            </div>
+            </section>
             <!-- /.row -->
           </div><!-- /.container-fluid -->
         </div>
         <!-- /.content -->
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/pages/widgets/small-box.html b/src/pages/widgets/small-box.html
index d2268ea00..ca8d49769 100644
--- a/src/pages/widgets/small-box.html
+++ b/src/pages/widgets/small-box.html
@@ -21,10 +21,22 @@
         "path": "../.."
       })
       <!-- Main content -->
-      <div class="content-wrapper">
-        @@include('./dashboard/_content-header.html', {
-          "header_name": "Widgets - Small Box"
-        })
+      <main class="content-wrapper">
+        <div class="content-header">
+          <div class="container-fluid">
+            <section class="row mb-2">
+              <div class="col-sm-6">
+                <div class="fs-3">Small Box</div>
+              </div>
+              <div class="col-sm-6">
+                <ol class="breadcrumb float-sm-end">
+                  <li class="breadcrumb-item"><a href="#">Home</a></li>
+                  <li class="breadcrumb-item active" aria-current="page">Small Box</li>
+                </ol>
+              </div>
+            </section>
+          </div>
+        </div>
         <!-- Main content -->
         <div class="content">
           <div class="container-fluid">
@@ -96,7 +108,7 @@
           </div><!-- /.container-fluid -->
         </div>
         <!-- /.content -->
-      </div>
+      </main>
       <!-- /.content-wrapper -->
 
       @@include('./dashboard/_footer.html', {
diff --git a/src/partials/_head.html b/src/partials/_head.html
index 8aafe522c..3bb7d0a1f 100644
--- a/src/partials/_head.html
+++ b/src/partials/_head.html
@@ -1,11 +1,15 @@
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!-- Primary Meta Tags -->
+<title>@@title</title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="title" content="@@title">
+<meta name="author" content="ColorlibHQ">
+<meta name="description" content="Volt Pro is a Premium Bootstrap 5 Admin Dashboard featuring over 800 components, 10+ plugins and 20 example pages using Vanilla JS.">
+<meta name="keywords" content="bootstrap 5, bootstrap, bootstrap 5 admin dashboard, bootstrap 5 dashboard, bootstrap 5 charts, bootstrap 5 calendar, bootstrap 5 datepicker, bootstrap 5 tables, bootstrap 5 datatable, vanilla js datatable, colorlibhq, colorlibhq dashboard, colorlibhq admin dashboard" />
 <!-- By adding @@path/css/dark/adminlte-dark-addon.css then the page supports both dark color schemes, and the page author prefers / default is light. -->
 <meta name="color-scheme" content="light dark">
 <!-- By adding @@path/css/dark/adminlte-dark-addon.css then the page supports both dark color schemes, and the page author prefers / default is dark. -->
 <!-- <meta name="color-scheme" content="dark light"> -->
-<title>@@title</title>
 <!-- Google Font: Source Sans Pro -->
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700&display=fallback">
 <!-- Font Awesome -->
diff --git a/src/partials/dashboard/_content-header.html b/src/partials/dashboard/_content-header.html
deleted file mode 100644
index 40591c30c..000000000
--- a/src/partials/dashboard/_content-header.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="content-header">
-  <div class="container-fluid">
-    <div class="row mb-2">
-      <div class="col-sm-6">
-        <div class="fs-3">@@header_name</div>
-      </div>
-      <div class="col-sm-6">
-        <ol class="breadcrumb float-sm-end">
-          <li class="breadcrumb-item"><a href="#">Home</a></li>
-          <li class="breadcrumb-item active" aria-current="page">@@header_name</li>
-        </ol>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/partials/dashboard/_sidenav.html b/src/partials/dashboard/_sidenav.html
index e6ea91e1e..e6dc07a67 100644
--- a/src/partials/dashboard/_sidenav.html
+++ b/src/partials/dashboard/_sidenav.html
@@ -1,11 +1,11 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-bg-dark sidebar-color-primary shadow">
   <div class="brand-container">
-    <a href="javascript:void(0)" class="brand-link">
+    <a href="javascript:;" class="brand-link">
       <img src="@@path/assets/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image opacity-80 shadow">
       <span class="brand-text fw-light">AdminLTE 4</span>
     </a>
-    <a class="pushmenu mx-1" data-lte-toggle="sidebar-mini" href="javascript:void(0)" role="button"><i class="fas fa-angle-double-left"></i></a>
+    <a class="pushmenu mx-1" data-lte-toggle="sidebar-mini" href="javascript:;" role="button"><i class="fas fa-angle-double-left"></i></a>
   </div>
   <!-- Sidebar -->
   <div class="sidebar">
@@ -13,7 +13,7 @@
       <!-- Sidebar Menu -->
       <ul class="nav nav-pills nav-sidebar flex-column" data-lte-toggle="treeview" role="menu" data-accordion="false">
         <li class="nav-item @@if (context.mainPage === 'dashboard') {menu-open}">
-          <a href="javascript:void(0)" class="nav-link @@if (context.mainPage === 'dashboard') {active}">
+          <a href="javascript:;" class="nav-link @@if (context.mainPage === 'dashboard') {active}">
             <i class="nav-icon fas fa-circle"></i>
             <p>
               Dashboard
@@ -42,7 +42,7 @@
           </ul>
         </li>
         <li class="nav-item @@if (context.mainPage === 'widgets') {menu-open}">
-          <a href="javascript:void(0)" class="nav-link @@if (context.mainPage === 'widgets') {active}">
+          <a href="javascript:;" class="nav-link @@if (context.mainPage === 'widgets') {active}">
             <i class="nav-icon fas fa-circle"></i>
             <p>
               Widgets
@@ -72,7 +72,7 @@
         </li>
 
         <li class="nav-item @@if (context.mainPage === 'layout') {menu-open}">
-          <a href="javascript:void(0)" class="nav-link @@if (context.mainPage === 'layout') {active}">
+          <a href="javascript:;" class="nav-link @@if (context.mainPage === 'layout') {active}">
             <i class="nav-icon fas fa-circle"></i>
             <p>
               Layout Options
@@ -90,7 +90,7 @@
           </ul>
         </li>
         <li class="nav-item @@if (context.mainPage === 'forms') {menu-open}">
-          <a href="javascript:void(0)" class="nav-link @@if (context.mainPage === 'forms') {active}">
+          <a href="javascript:;" class="nav-link @@if (context.mainPage === 'forms') {active}">
             <i class="nav-icon fas fa-circle"></i>
             <p>
               Forms
@@ -107,7 +107,7 @@
           </ul>
         </li>
         <li class="nav-item @@if (context.mainPage === 'tables') {menu-open}">
-          <a href="javascript:void(0)" class="nav-link @@if (context.mainPage === 'tables') {active}">
+          <a href="javascript:;" class="nav-link @@if (context.mainPage === 'tables') {active}">
             <i class="nav-icon fas fa-circle"></i>
             <p>
               Tables
@@ -125,13 +125,13 @@
         </li>
         <li class="nav-header">MULTI LEVEL EXAMPLE</li>
         <li class="nav-item">
-          <a href="javascript:void(0)" class="nav-link">
+          <a href="javascript:;" class="nav-link">
             <i class="nav-icon fas fa-circle"></i>
             <p>Level 1</p>
           </a>
         </li>
         <li class="nav-item">
-          <a href="javascript:void(0)" class="nav-link">
+          <a href="javascript:;" class="nav-link">
             <i class="nav-icon fas fa-circle"></i>
             <p>
               Level 1
@@ -140,13 +140,13 @@
           </a>
           <ul class="nav nav-treeview">
             <li class="nav-item">
-              <a href="javascript:void(0)" class="nav-link">
+              <a href="javascript:;" class="nav-link">
                 <i class="nav-icon far fa-circle"></i>
                 <p>Level 2</p>
               </a>
             </li>
             <li class="nav-item">
-              <a href="javascript:void(0)" class="nav-link">
+              <a href="javascript:;" class="nav-link">
                 <i class="nav-icon far fa-circle"></i>
                 <p>
                   Level 2
@@ -155,19 +155,19 @@
               </a>
               <ul class="nav nav-treeview">
                 <li class="nav-item">
-                  <a href="javascript:void(0)" class="nav-link">
+                  <a href="javascript:;" class="nav-link">
                     <i class="nav-icon far fa-dot-circle"></i>
                     <p>Level 3</p>
                   </a>
                 </li>
                 <li class="nav-item">
-                  <a href="javascript:void(0)" class="nav-link">
+                  <a href="javascript:;" class="nav-link">
                     <i class="nav-icon far fa-dot-circle"></i>
                     <p>Level 3</p>
                   </a>
                 </li>
                 <li class="nav-item">
-                  <a href="javascript:void(0)" class="nav-link">
+                  <a href="javascript:;" class="nav-link">
                     <i class="nav-icon far fa-dot-circle"></i>
                     <p>Level 3</p>
                   </a>
@@ -175,7 +175,7 @@
               </ul>
             </li>
             <li class="nav-item">
-              <a href="javascript:void(0)" class="nav-link">
+              <a href="javascript:;" class="nav-link">
                 <i class="nav-icon far fa-circle"></i>
                 <p>Level 2</p>
               </a>
@@ -183,26 +183,26 @@
           </ul>
         </li>
         <li class="nav-item">
-          <a href="javascript:void(0)" class="nav-link">
+          <a href="javascript:;" class="nav-link">
             <i class="nav-icon fas fa-circle"></i>
             <p>Level 1</p>
           </a>
         </li>
         <li class="nav-header">LABELS</li>
         <li class="nav-item">
-          <a href="javascript:void(0)" class="nav-link">
+          <a href="javascript:;" class="nav-link">
             <i class="nav-icon far fa-circle text-danger"></i>
             <p class="text">Important</p>
           </a>
         </li>
         <li class="nav-item">
-          <a href="javascript:void(0)" class="nav-link">
+          <a href="javascript:;" class="nav-link">
             <i class="nav-icon far fa-circle text-warning"></i>
             <p>Warning</p>
           </a>
         </li>
         <li class="nav-item">
-          <a href="javascript:void(0)" class="nav-link">
+          <a href="javascript:;" class="nav-link">
             <i class="nav-icon far fa-circle text-info"></i>
             <p>Informational</p>
           </a>
diff --git a/src/partials/dashboard/_topbar.html b/src/partials/dashboard/_topbar.html
index f12eb5ae4..03292f94d 100644
--- a/src/partials/dashboard/_topbar.html
+++ b/src/partials/dashboard/_topbar.html
@@ -131,7 +131,7 @@
           </li>
           <!-- Menu Body -->
           <li class="user-body">
-            <div class="row">
+            <section class="row">
               <div class="col-4 text-center">
                 <a href="#">Followers</a>
               </div>
@@ -141,7 +141,7 @@
               <div class="col-4 text-center">
                 <a href="#">Friends</a>
               </div>
-            </div>
+            </section>
             <!-- /.row -->
           </li>
           <!-- Menu Footer-->
diff --git a/src/scss/_layout.scss b/src/scss/_layout.scss
deleted file mode 100644
index f383ab1ef..000000000
--- a/src/scss/_layout.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@import "layout/wrapper";
-@import "layout/main-header";
-@import "layout/brand-container";
-@import "layout/main-sidebar";
-@import "layout/sidebar";
-@import "layout/nav-sidebar";
-@import "layout/sidebar-collapse";
-// @import "layout/sidebar-horizontal";
-@import "layout/sidebar-close";
-@import "layout/content-wrapper";
-@import "layout/content-header";
-@import "layout/content";
-@import "layout/main-footer";
-@import "layout/layout-fixed";
-@import "layout/layout-mobile";