diff --git a/app/components/Modal.tsx b/app/components/Modal.tsx
index 54c4db8..ea58835 100644
--- a/app/components/Modal.tsx
+++ b/app/components/Modal.tsx
@@ -126,7 +126,7 @@ function Modal({ parameters, isOpen, setIsOpen }: Properties) {
 								</Dialog.Description>
 							) : undefined}
 							{parameters.children ? (
-								<div className='mt-12 w-full'>
+								<div className='w-full mt-4'>
 									{parameters.children}
 								</div>
 							) : undefined}
@@ -134,8 +134,7 @@ function Modal({ parameters, isOpen, setIsOpen }: Properties) {
 								variant='emphasized'
 								type='submit'
 								className={clsx(
-									'w-full',
-									parameters.children ? 'mt-4' : 'mt-12',
+									'w-full mt-12',
 									parameters.variant === 'danger'
 										? 'bg-red-800 dark:bg-red-500 focus:ring-red-500 dark:focus:ring-red-500'
 										: ''
diff --git a/app/routes/_data.machines._index.tsx b/app/routes/_data.machines._index.tsx
index 2267583..8af7bad 100644
--- a/app/routes/_data.machines._index.tsx
+++ b/app/routes/_data.machines._index.tsx
@@ -123,16 +123,17 @@ export default function Page() {
 									)}
 									>
 										<Dropdown
-											className='left-1/4 cursor-pointer'
+											className='left-1/4'
 											width='w-48'
 											button={(
 												<EllipsisHorizontalIcon className='w-5 h-5'/>
 											)}
 										>
-											<Dropdown.Item>
+											<Dropdown.Item variant='static'>
 												<button
+													disabled
 													type='button'
-													className='text-left'
+													className='text-left w-full opacity-50'
 													onClick={() => {
 														open()
 													}}
@@ -140,10 +141,11 @@ export default function Page() {
 													Edit machine name
 												</button>
 											</Dropdown.Item>
-											<Dropdown.Item>
+											<Dropdown.Item variant='static'>
 												<button
+													disabled
 													type='button'
-													className='text-left'
+													className='text-left w-full opacity-50'
 													onClick={() => {
 														open()
 													}}
@@ -151,10 +153,11 @@ export default function Page() {
 													Edit route settings
 												</button>
 											</Dropdown.Item>
-											<Dropdown.Item>
+											<Dropdown.Item variant='static'>
 												<button
+													disabled
 													type='button'
-													className='text-left'
+													className='text-left w-full opacity-50'
 													onClick={() => {
 														open()
 													}}
@@ -165,7 +168,7 @@ export default function Page() {
 											<Dropdown.Item>
 												<button
 													type='button'
-													className='text-left text-red-700'
+													className='text-left text-red-700 w-full'
 													onClick={() => {
 														open({
 															title: 'Remove Machine',
diff --git a/app/routes/_data.tsx b/app/routes/_data.tsx
index 513876d..4f8b868 100644
--- a/app/routes/_data.tsx
+++ b/app/routes/_data.tsx
@@ -71,7 +71,7 @@ export default function Layout() {
 								</Dropdown.Item>
 								<Dropdown.Item className='text-red-700 cursor-pointer'>
 									<Form method='POST' action='/logout'>
-										<button type='submit'>
+										<button type='submit' className='w-full'>
 											Logout
 										</button>
 									</Form>