diff --git a/src/Components/AppShell/NavBar.tsx b/src/Components/AppShell/NavBar.tsx
index bc26ff6a..49976fd7 100644
--- a/src/Components/AppShell/NavBar.tsx
+++ b/src/Components/AppShell/NavBar.tsx
@@ -69,9 +69,9 @@ export default function NavBar({ appName }: { appName: string }) {
   if (showNav) {
     return (
       <>
-        <div className='tw:navbar tw:bg-base-100 tw:z-9998 tw:shadow-xl tw:relative'>
+        <div className='tw:navbar tw:bg-base-100 tw:z-9998 tw:shadow-xl tw:relative tw:p-0'>
           <button
-            className='tw:btn tw:btn-square tw:btn-ghost'
+            className='tw:btn tw:btn-square tw:btn-ghost tw:ml-3'
             aria-controls='#sidenav'
             aria-haspopup='true'
             onClick={() => toggleSidebar()}
@@ -101,7 +101,7 @@ export default function NavBar({ appName }: { appName: string }) {
           </div>
 
           {isAuthenticated ? (
-            <div className='tw:flex-none'>
+            <div className='tw:flex tw:mr-2'>
               <Link
                 to={`${userProfile.id && '/item/' + userProfile.id}`}
                 className='tw:flex tw:items-center'
@@ -121,7 +121,7 @@ export default function NavBar({ appName }: { appName: string }) {
                 </label>
                 <ul
                   tabIndex={0}
-                  className='tw:menu tw:menu-compact tw:dropdown-content tw:mt-3 tw:p-2 tw:shadow tw:bg-base-100 tw:rounded-box tw:w-52 tw:z-10000!'
+                  className='tw:menu tw:menu-compact tw:dropdown-content tw:mt-4 tw:p-2 tw:shadow tw:bg-base-100 tw:rounded-box tw:w-52 tw:z-10000!'
                 >
                   <li>
                     <Link to={`${userProfile.id && '/edit-item/' + userProfile.id}`}>Profile</Link>
@@ -142,10 +142,10 @@ export default function NavBar({ appName }: { appName: string }) {
               </div>
             </div>
           ) : (
-            <div>
+            <div className='tw:mr-2 tw:flex tw:items-center'>
               <div className='tw:hidden tw:md:flex'>
                 <Link to={'/login'}>
-                  <div className='tw:btn tw:btn-ghost tw:mr-2'>Login</div>
+                  <div className='tw:self-center tw:btn tw:btn-ghost tw:mr-2'>Login</div>
                 </Link>
 
                 <Link to={'/signup'}>
@@ -158,7 +158,7 @@ export default function NavBar({ appName }: { appName: string }) {
                 </label>
                 <ul
                   tabIndex={1}
-                  className='tw:menu tw:dropdown-content tw:mt-3 tw:p-2 tw:shadow tw:bg-base-100 tw:rounded-box tw:w-52 tw:z-10000!'
+                  className='tw:menu tw:dropdown-content tw:mt-4 tw:p-2 tw:shadow tw:bg-base-100 tw:rounded-box tw:w-52 tw:z-10000!'
                 >
                   <li>
                     <Link to={'/login'}>Login</Link>
diff --git a/src/Components/Map/Subcomponents/Controls/SearchControl.tsx b/src/Components/Map/Subcomponents/Controls/SearchControl.tsx
index 10a96a43..fdc0bda4 100644
--- a/src/Components/Map/Subcomponents/Controls/SearchControl.tsx
+++ b/src/Components/Map/Subcomponents/Controls/SearchControl.tsx
@@ -118,7 +118,7 @@ export const SearchControl = () => {
                 placeholder='search ...'
                 autoComplete='off'
                 value={value}
-                className='tw:input tw:input-bordered tw:grow tw:shadow-xl tw:rounded-lg tw:pr-12'
+                className='tw:input tw:input-bordered tw:h-12 tw:grow tw:shadow-xl tw:rounded-lg tw:pr-12'
                 ref={searchInput}
                 onChange={(e) => setValue(e.target.value)}
                 onFocus={() => {
diff --git a/src/Components/Templates/ItemCard.tsx b/src/Components/Templates/ItemCard.tsx
index 3c8e2ad0..02d86240 100644
--- a/src/Components/Templates/ItemCard.tsx
+++ b/src/Components/Templates/ItemCard.tsx
@@ -24,7 +24,7 @@ export const ItemCard = ({
 
   return (
     <div
-      className='tw:cursor-pointer card tw:border-[1px] tw:border-base-300 card-body tw:shadow-xl tw:bg-base-100 tw:text-base-content tw:p-4 tw:mb-4 tw:h-fit'
+      className='tw:cursor-pointer tw:card tw:border-[1px] tw:border-base-300 tw:card-body tw:shadow-xl tw:bg-base-100 tw:text-base-content tw:p-4 tw:mb-4 tw:h-fit'
       onClick={() => {
         // We could have an onClick callback instead
         const params = new URLSearchParams(window.location.search)
diff --git a/src/Components/Templates/MapOverlayPage.tsx b/src/Components/Templates/MapOverlayPage.tsx
index 752050fa..1d3bbc70 100644
--- a/src/Components/Templates/MapOverlayPage.tsx
+++ b/src/Components/Templates/MapOverlayPage.tsx
@@ -45,11 +45,11 @@ export function MapOverlayPage({
       >
         <div
           ref={overlayRef}
-          className={`${card ? 'card card-body' : ''} tw:shadow-xl tw:bg-base-100 tw:p-6 ${className ?? ''} ${backdrop ? '' : 'tw:z-2000'} tw:absolute tw:top-0 tw:bottom-0 tw:right-0 tw:left-0 tw:m-auto`}
+          className={`${card ? 'tw:card tw:card-body' : ''} tw:shadow-xl tw:bg-base-100 tw:p-6 ${className ?? ''} ${backdrop ? '' : 'tw:z-2000'} tw:absolute tw:top-0 tw:bottom-0 tw:right-0 tw:left-0 tw:m-auto`}
         >
           {children}
           <button
-            className='btn btn-sm btn-circle btn-ghost tw:absolute tw:right-2 tw:top-2'
+            className='tw:btn tw:btn-sm tw:btn-circle tw:btn-ghost tw:absolute tw:right-2 tw:top-2'
             onClick={() => closeScreen()}
           >
             ✕