diff --git a/assets/static/css/main.css b/assets/static/css/main.css
index 1207543..6665b82 100644
--- a/assets/static/css/main.css
+++ b/assets/static/css/main.css
@@ -97,13 +97,6 @@ a:not([class]) {
   color: currentColor;
 }
 
-/* Make images easier to work with */
-img,
-picture {
-  max-width: 100%;
-  display: block;
-}
-
 /* Inherit fonts for inputs and buttons */
 input, button,
 textarea, select {
@@ -504,21 +497,20 @@ th.operations, td.operations {
   height: 50px;
   background-color: var(--primary-color);
   color: #ffffff;
-  font-size: 1.25rem;
+  font-size: 22px;
   font-weight: bold;
   padding-left: 8px;
   width: 300px;
   display: flex;
   align-items: center;
-  position: fixed;
 }
 
 #app-title a {
   color: #ffffff;
 }
 
-#app-title img {
-  height: 32px;
+.logo {
+  width: 32px;
   float: left;
   padding-right: 10px;
 }
@@ -527,10 +519,6 @@ th.operations, td.operations {
   vertical-align: top;
 }
 
-#main-sidebar-content {
-  margin-top: 50px;
-}
-
 #main-sidebar-content h5 {
   font-size: 1rem;
   margin-top: 10px;
@@ -559,12 +547,8 @@ th.operations, td.operations {
   overflow: hidden;
 }
 
-#page-title {
-  font-size: 1.4rem;
-  float: left;
-}
-
 #page-title-title {
+  font-size: 22px;
   color: #ffffff;
   float: left;
 }
@@ -851,14 +835,15 @@ th.operations, td.operations {
 }
 
 #quickbox-title {
-  float: left;
+  display: flex;
+  align-items: center;
   font-weight: bold;
   width:100%;
 }
 
 #quickbox-title-title {
-  float: left;
-  font-size: 1.4rem;
+  width: 100%;
+  font-size: 22px;
 }
 
 #quickbox-close {
@@ -874,12 +859,7 @@ th.operations, td.operations {
   font-size: 18px;
   display: flex;
   align-items: center;
-}
-
-#quickbox-top-bar .logo {
-  float: left;
-  margin-left: 8px;
-  padding-right: 10px;
+  padding-left: 8px;
 }
 
 .quickbox-row {
@@ -1096,6 +1076,12 @@ dialog .content h5 {
 
   #page-title {
     width: 100%;
+    display: flex;
+    align-items: center;
+  }
+
+  #page-title-title {
+    width: 100%;
   }
 
   .table-all.responsive table,
diff --git a/assets/templates/base.tmpl b/assets/templates/base.tmpl
index e4ef169..27c20f7 100644
--- a/assets/templates/base.tmpl
+++ b/assets/templates/base.tmpl
@@ -13,26 +13,23 @@
     <link rel="icon" type="image/svg+xml" href="/static/img/brainminder-icon.svg">
     
     {{block "page:meta" . }}
-    {{
-      end
-    }}
+    {{ end }}
   </head>
   <body class="base" hx-headers='{"X-CSRF-TOKEN": "{{ .CSRFToken }}"}'>
   {{template "partial:sidebar" .}}
   <div id="page-main">
     <div id="page-top-bar">
       <div id="page-title-container">
-        <a class="hide-large" onclick="bm_toggle_sidebar('main-sidebar'); return false" href="#" style="float: left; padding-right: 10px;">
-          <img src="/static/img/brainminder.svg" alt="BrainMinder" style="height: 32px;" />
+        <a class="hide-large" onclick="bm_toggle_sidebar('main-sidebar'); return false" href="#" style="float: left;">
+          <img src="/static/img/brainminder.svg" alt="BrainMinder" class="logo" />
         </a>
         <div id="page-title">{{template "page:title" .}}</div>
         <div id="search-bar" class="hide-small">
           <form method="POST" hx-post="/items/search" hx-target="#page-content" hx-push-url="true" style="float: left">
-          <input type="hidden" name="csrf_token" value="{{.CSRFToken}}" />
           <input type="text" id="search-text" name="SearchText" class="bar-item" placeholder="Search.." />
           <button type="submit"><i class="bi bi-search"></i></button>
           </form>
-          <a class="button" onclick="bm_toggle_quickbox();"><i class="bi bi-inbox-fill"></i></a>
+          <a class="button" style="position: relative; top: 4px;" onclick="bm_toggle_quickbox();"><i class="bi bi-inbox-fill"></i></a>
         </div>
       </div>
     </div>
@@ -73,12 +70,10 @@
 
     <div id="quickbox">
       <div class="noswipe" id="quickbox-top-bar">
-          <a class="hide-large logo"  onclick="bm_toggle_sidebar('main-sidebar');">
-            <img alt="BrainMinder" src="/static/img/brainminder.svg" style="height: 32px;">
-          </a>
+        <a class="hide-large logo"  onclick="bm_toggle_sidebar('main-sidebar');"><img alt="BrainMinder" src="/static/img/brainminder.svg" class="logo"></a>
         <div id="quickbox-title">
           <div id="quickbox-title-title"><h5>Quickbox</h5></div>
-            <div id="quickbox-close"><button onclick="bm_hide_quickbox()"><i class="bi bi-x-circle-fill"></i></button></div>
+          <div id="quickbox-close"><button onclick="bm_hide_quickbox()"><i class="bi bi-x-circle-fill"></i></button></div>
         </div>
       </div>
 
diff --git a/assets/templates/items/fields.tmpl b/assets/templates/items/fields.tmpl
index c396bf3..aa6d954 100644
--- a/assets/templates/items/fields.tmpl
+++ b/assets/templates/items/fields.tmpl
@@ -7,7 +7,6 @@
 {{ if eq .Is_multiple 1}}
 <fieldset>
   <label>{{ .Title }}</label>
-
   <div id="fields-{{ .Type_field_id }}">
   {{ $g_counter := 0 }}
   {{ range $counter, $value := $values}}
diff --git a/assets/templates/items/share.tmpl b/assets/templates/items/share.tmpl
index f2b32c2..cc33488 100644
--- a/assets/templates/items/share.tmpl
+++ b/assets/templates/items/share.tmpl
@@ -5,7 +5,7 @@
           <span class="close-dialog button close"><i class='close-dialog bi bi-x-circle-fill'></i></span>
       </header>
       <div class="content">
-          <form>
+          <form hx-post="/item/share/{{ .item.Id }}" hx-target="#message">
             <h5>{{ .item.Title }}</h5>
             <div class="row">
               <div class="col l6">
@@ -43,22 +43,8 @@
             <fieldset>
               <legend>Permissions</legend>
               <div class="row">
-                <div class="col l6">
-                    <p>
-                      <label class="switch">
-                        <input class="" name="read" type="checkbox" value="1" checked="checked">
-                        <span class="slider round"></span>
-                      </label><span class="label-checkbox">Read</span>
-                    </p>
-                </div>
-                <div class="col l6">
-                  <p>
-                    <label class="switch">
-                      <input class="" name="edit" type="checkbox" value="1">
-                      <span class="slider round"></span>
-                    </label><span class="label-checkbox">Edit</span>
-                  </p>
-              </div>
+                <div class="col l6">{{ widget_checkbox "read" "Read" "1" "" }}</div>
+                <div class="col l6">{{ widget_checkbox "edit" "Edit" "1" "" }}</div>
             </div>  
             </fieldset>
             <div id="footer-navbar">
diff --git a/assets/templates/partials/sidebar.tmpl b/assets/templates/partials/sidebar.tmpl
index 655e101..e6fe49f 100644
--- a/assets/templates/partials/sidebar.tmpl
+++ b/assets/templates/partials/sidebar.tmpl
@@ -2,24 +2,15 @@
 <!-- Sidebar/menu -->
 <nav id="main-sidebar">
 <div id="app-title">
-  <a class="hide-large" href="#" onclick="bm_toggle_sidebar('main-sidebar'); return false;">
-    <img src="/static/img/brainminder.svg" alt="BrainMinder" />
-  </a>
-  <a class="hide-large" href="#" onclick="bm_toggle_sidebar('main-sidebar'); return false;">
-    <span>BrainMinder</span>
-  </a>
-  <a class="hide-small hide-medium" href="/" hx-get="/" hx-push-url="true" hx-target="#page-content">
-    <img src="/static/img/brainminder.svg" alt="BrainMinder" />
-  </a>
-  <a class="hide-small hide-medium" href="/" hx-get="/" hx-push-url="true" hx-target="#page-content">
-    <span>BrainMinder</span>
-  </a>
+  <a class="hide-large" href="#" onclick="bm_toggle_sidebar('main-sidebar'); return false;"><img src="/static/img/brainminder.svg" alt="BrainMinder" class="logo" /></a>
+  <a class="hide-large" href="#" onclick="bm_toggle_sidebar('main-sidebar'); return false;"><h5>BrainMinder</h5></a>
+  <a class="hide-small hide-medium" href="/" hx-get="/" hx-push-url="true" hx-target="#page-content"><img src="/static/img/brainminder.svg" alt="BrainMinder" class="logo" /></a>
+  <a class="hide-small hide-medium" href="/" hx-get="/" hx-push-url="true" hx-target="#page-content"><h5>BrainMinder</h5></a>
 </div>
 
 <div id="main-sidebar-content">
   <div id="sidebar-search" class="hide-large">
     <form method="POST" hx-post="/items/search" hx-target="#page-content" hx-push-url="true" hx-on:submit="bm_sidebar_click('main-sidebar')">
-      <input type="hidden" name="csrf_token" value="{{.CSRFToken}}" />
       <div style="display: flex;">
         <div style="flex-grow:1">
           <input type="text" id="searchText" name="SearchText" placeholder="Search.." />
