diff --git a/templates/element/genericElements/Form/genericForm.php b/templates/element/genericElements/Form/genericForm.php
index 5807da6..75d6200 100644
--- a/templates/element/genericElements/Form/genericForm.php
+++ b/templates/element/genericElements/Form/genericForm.php
@@ -98,7 +98,7 @@
             'body' => sprintf(
                 '%s%s%s%s%s%s',
                 empty($data['description']) ? '' : sprintf(
-                    '<div class="pb-2">%s</div>',
+                    '<div class="pb-2 font-weight-light">%s</div>',
                     $data['description']
                 ),
                 $ajaxFlashMessage,
@@ -135,16 +135,16 @@
         );
     } else {
         echo sprintf(
-            '%s<h2>%s</h2>%s%s%s%s%s%s%s%s%s',
+            '%s<h2 class="font-weight-light">%s</h2>%s%s%s%s%s%s%s%s%s',
             empty($ajax) ? '<div class="col-8">' : '',
             empty($data['title']) ? sprintf('%s %s', $actionName, $modelName) : h($data['title']),
             $formCreate,
             $ajaxFlashMessage,
             empty($data['description']) ? '' : sprintf(
-                '<div class="pb-3">%s</div>',
+                '<div class="pb-3 font-weight-light">%s</div>',
                 $data['description']
             ),
-            $fieldsString,
+            sprintf('<div class="sub-container">%s</div>', $fieldsString),
             empty($metaTemplateString) ? '' : $this->element(
                 'genericElements/accordion_scaffold', [
                     'body' => $metaTemplateString,
diff --git a/templates/element/genericElements/IndexTable/index_table.php b/templates/element/genericElements/IndexTable/index_table.php
index 7e9b274..bd190b4 100644
--- a/templates/element/genericElements/IndexTable/index_table.php
+++ b/templates/element/genericElements/IndexTable/index_table.php
@@ -19,11 +19,11 @@
     $tableRandomValue = Cake\Utility\Security::randomString(8);
     echo '<div id="table-container-' . h($tableRandomValue) . '">';
     if (!empty($data['title'])) {
-        echo sprintf('<h2>%s</h2>', h($data['title']));
+        echo sprintf('<h2 class="font-weight-light">%s</h2>', h($data['title']));
     }
     if (!empty($data['description'])) {
         echo sprintf(
-            '<div>%s</div>',
+            '<div class="font-weight-light">%s</div>',
             empty($data['description']) ? '' : h($data['description'])
         );
     }
diff --git a/templates/element/genericElements/SingleViews/single_view.php b/templates/element/genericElements/SingleViews/single_view.php
index b17244f..3e2a3b9 100644
--- a/templates/element/genericElements/SingleViews/single_view.php
+++ b/templates/element/genericElements/SingleViews/single_view.php
@@ -111,10 +111,10 @@
         $title;
     echo sprintf(
         "<div id=\"single-view-table-container-%s\">
-            <h2>%s</h2>
+            <h2 class=\"font-weight-light\">%s</h2>
             %s%s
-            <div class=\"px-3\">
-                <table id=\"single-view-table-%s\" class=\"table table-striped col-sm-8\">%s</table>
+            <div class=\"px-3 col-sm-8 sub-container\">
+                <table id=\"single-view-table-%s\" class=\"table table-striped\">%s</table>
             </div>
             <div id=\"metaTemplates\" class=\"col-lg-8 px-0\">%s</div>
             <div id=\"accordion\">%s</div>
diff --git a/templates/element/layouts/header/header-breadcrumb.php b/templates/element/layouts/header/header-breadcrumb.php
index f4770cf..5757178 100644
--- a/templates/element/layouts/header/header-breadcrumb.php
+++ b/templates/element/layouts/header/header-breadcrumb.php
@@ -15,7 +15,7 @@
             '<nav class="header-breadcrumb d-xl-block d-none"{{attrs}}><ol class="">{{content}}</ol></nav>'
         ),
         'item' => sprintf(
-            '<li class="header-breadcrumb-item"{{attrs}}><i class="{{icon}} mr-1"></i><a href="{{url}}"{{innerAttrs}}>{{title}}</a></li>{{separator}}',
+            '<li class="header-breadcrumb-item"{{attrs}}><i class="{{icon}} mr-1"></i><a class="{{linkClass}}" href="{{url}}"{{innerAttrs}}>{{title}}</a></li>{{separator}}',
             empty($darkMode) ? 'light' : 'dark'
         ),
         'itemWithoutLink' => '<li class="header-breadcrumb-item"{{attrs}}><span{{innerAttrs}}>{{title}}</span></li>{{separator}}',
@@ -23,7 +23,7 @@
     ]);
 
     if (!empty($breadcrumb)) {
-        foreach ($breadcrumb as $entry) {
+        foreach ($breadcrumb as $i => $entry) {
             if (!empty($entry['textGetter'])) {
                 $entry['label'] = Cake\Utility\Hash::get($entity, $entry['textGetter']);
             }
@@ -33,6 +33,7 @@
             $this->Breadcrumbs->add(h($entry['label']), Router::url($entry['url']), [
                 'title' => h($entry['label']),
                 'templateVars' => [
+                    'linkClass' => $i == 0 ? 'font-weight-light' : '',
                     'icon' => !empty($entry['icon']) ? $this->FontAwesome->getClass(h($entry['icon'])) : ''
                 ]
             ]);
diff --git a/webroot/css/layout.css b/webroot/css/layout.css
index 9648051..1245fca 100644
--- a/webroot/css/layout.css
+++ b/webroot/css/layout.css
@@ -14,7 +14,7 @@ body {
 
 .sub-container {
     background-color: white;
-    padding: 0.5rem;
+    padding: 0.75rem;
     border-radius: 0.25rem;
     margin-top: 0.75rem;
     margin-bottom: 1rem;
@@ -100,7 +100,7 @@ main.content {
     left: 0;
     transition: width .05s linear;
     transform:translateZ(0) scale(1,1);
-    z-index:1041;
+    z-index:1039;
 }
 
 .sidebar.expanded, .sidebar:hover {
@@ -112,7 +112,7 @@ main.content {
 }
 
 .sidebar ~ main.content:after {
-    z-index: 1040;
+    z-index: 1038;
     content: ' ';
     transition: opacity 0.5s;
     position: fixed;