diff --git a/src/App.tsx b/src/App.tsx
index 389d2cf8..c20117c0 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -137,7 +137,7 @@ const App = (): JSX.Element => {
     >
       <div className="flex flex-col h-full bg-gray-200 dark:bg-primaryDark">
         <div className="flex flex-shrink-0 overflow-hidden bg-primary dark:bg-primary">
-          <div className="w-full overflow-hidden bg-white border-b md:mt-8 md:mx-8 md:pt-4 md:pb-3 md:rounded-t-3xl dark:border-gray-600 md:shadow-md dark:bg-primaryDark">
+          <div className="w-full overflow-hidden bg-white border-b md:mt-6 md:mx-6 md:pt-4 md:pb-3 md:rounded-t-3xl dark:border-gray-600 md:shadow-md dark:bg-primaryDark">
             <div className="flex items-center justify-between h-16 px-4 md:px-6">
               <div className="hidden md:flex">
                 <Logo />
@@ -153,7 +153,7 @@ const App = (): JSX.Element => {
         </div>
         <MobileNav />
 
-        <div className="flex flex-grow w-full min-h-0 md:px-8 md:mb-8">
+        <div className="flex flex-grow w-full min-h-0 md:px-6 md:mb-6">
           <div className="flex w-full bg-gray-100 md:shadow-xl md:overflow-hidden dark:bg-secondaryDark md:rounded-b-3xl">
             {route.name === 'messages' && <Messages />}
             {route.name === 'nodes' && <Nodes />}
diff --git a/src/components/templates/PrimaryTemplate.tsx b/src/components/templates/PrimaryTemplate.tsx
index cb87fa59..9c9797e2 100644
--- a/src/components/templates/PrimaryTemplate.tsx
+++ b/src/components/templates/PrimaryTemplate.tsx
@@ -20,16 +20,12 @@ export const PrimaryTemplate = ({
       <div className="flex p-4 bg-white border-b md:flex-row flex-0 md:items-center md:justify-between md:px-10 dark:border-gray-600 dark:bg-secondaryDark">
         {button && <div className="pr-2 m-auto md:hidden">{button}</div>}
         <div className="flex-1 min-w-0">
-          <div className="flex flex-wrap items-center font-medium">
-            <div>
-              <a className="whitespace-nowrap text-primary">{tagline}</a>
-            </div>
-          </div>
-          <div className="mt-2">
-            <h2 className="text-3xl font-extrabold leading-7 tracking-tight truncate md:text-4xl md:leading-10 dark:text-white">
-              {title}
-            </h2>
-          </div>
+          <a className="whitespace-nowrap font-medium text-primary">
+            {tagline}
+          </a>
+          <h2 className="text-3xl font-extrabold leading-7 tracking-tight truncate md:text-4xl md:leading-10 dark:text-white">
+            {title}
+          </h2>
         </div>
       </div>
       <div className="flex-auto flex-grow p-6 overflow-y-auto bg-white md:p-10 dark:bg-secondaryDark">
diff --git a/src/index.css b/src/index.css
index b5c61c95..9253a59f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,3 +1,23 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+/* custom scrollbar */
+::-webkit-scrollbar {
+  width: 20px;
+}
+
+::-webkit-scrollbar-track {
+  background-color: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: #d6dee1;
+  border-radius: 20px;
+  border: 6px solid transparent;
+  background-clip: content-box;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background-color: #a8bbbf;
+}
diff --git a/src/pages/settings/Device.tsx b/src/pages/settings/Device.tsx
index 266fe4c8..2c7c9202 100644
--- a/src/pages/settings/Device.tsx
+++ b/src/pages/settings/Device.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import { Card } from '@app/components/generic/Card';
 import { Toggle } from '@app/components/generic/Toggle';
 import { connection } from '@app/core/connection';
 import { useAppSelector } from '@app/hooks/redux';
@@ -62,17 +63,22 @@ export const Device = ({ navOpen, setNavOpen }: DeviceProps): JSX.Element => {
         </Button>
       }
     >
-      <div className="w-full max-w-3xl md:max-w-xl">
-        <form className="space-y-2" onSubmit={onSubmit}>
-          <Input label={'Device Name'} {...register('longName')} />
-          <Input
-            label={'Short Name'}
-            maxLength={3}
-            {...register('shortName')}
-          />
-          <Toggle label="Licenced Operator?" {...register('isLicensed')} />
-        </form>
-      </div>
+      <Card
+        title="Basic settings"
+        description="Device name and user parameters"
+      >
+        <div className="p-10">
+          <form className="space-y-2" onSubmit={onSubmit}>
+            <Input label={'Device Name'} {...register('longName')} />
+            <Input
+              label={'Short Name'}
+              maxLength={3}
+              {...register('shortName')}
+            />
+            <Toggle label="Licenced Operator?" {...register('isLicensed')} />
+          </form>
+        </div>
+      </Card>
     </PrimaryTemplate>
   );
 };