diff --git a/leaky-ships/components/BurgerMenu.tsx b/leaky-ships/components/BurgerMenu.tsx
index 315441c..521c13f 100644
--- a/leaky-ships/components/BurgerMenu.tsx
+++ b/leaky-ships/components/BurgerMenu.tsx
@@ -11,7 +11,7 @@ function BurgerMenu({
   return (
     <button
       className={classNames(
-        "absolute top-4 left-4 flex h-16 w-16 items-center justify-center rounded-lg border-b-2 border-shield-gray bg-grayish shadow-lg duration-100 active:border-t-2 active:border-b-0 md:top-6 md:left-6 md:h-20  md:w-20 md:rounded-xl md:border-b-4 md:active:border-t-4 lg:top-8 lg:left-8 xl:top-12 xl:left-12 xl:h-24 xl:w-24",
+        "absolute left-4 top-4 flex h-16 w-16 items-center justify-center rounded-lg border-b-2 border-shield-gray bg-grayish shadow-lg duration-100 active:border-b-0 active:border-t-2 md:left-6 md:top-6 md:h-20  md:w-20 md:rounded-xl md:border-b-4 md:active:border-t-4 lg:left-8 lg:top-8 xl:left-12 xl:top-12 xl:h-24 xl:w-24",
         { "blur-sm": blur }
       )}
       onClick={() => onClick && setTimeout(onClick, 200)}
diff --git a/leaky-ships/components/Lobby/LobbyFrame.tsx b/leaky-ships/components/Lobby/LobbyFrame.tsx
index 6aa8155..19de8d6 100644
--- a/leaky-ships/components/Lobby/LobbyFrame.tsx
+++ b/leaky-ships/components/Lobby/LobbyFrame.tsx
@@ -77,7 +77,7 @@ function LobbyFrame({ openSettings }: { openSettings: () => void }) {
       </div>
       <div className="flex items-center justify-center border-t-2 border-slate-900">
         <button
-          className="font-farro mx-32 my-4 rounded-xl border-b-4 border-red-400 bg-red-500 px-12 py-4 text-5xl font-medium duration-100 active:border-t-4 active:border-b-0"
+          className="font-farro mx-32 my-4 rounded-xl border-b-4 border-red-400 bg-red-500 px-12 py-4 text-5xl font-medium duration-100 active:border-b-0 active:border-t-4"
           onClick={() => {
             leave(async () => {
               await router.push("/")
@@ -87,7 +87,7 @@ function LobbyFrame({ openSettings }: { openSettings: () => void }) {
         >
           LEAVE
         </button>
-        <button className="font-farro mx-32 my-4 rounded-xl border-b-4 border-orange-400 bg-warn px-12 py-4 text-5xl font-medium duration-100 active:border-t-4 active:border-b-0">
+        <button className="font-farro mx-32 my-4 rounded-xl border-b-4 border-orange-400 bg-warn px-12 py-4 text-5xl font-medium duration-100 active:border-b-0 active:border-t-4">
           START
         </button>
       </div>
diff --git a/leaky-ships/components/Lobby/Player.tsx b/leaky-ships/components/Lobby/Player.tsx
index df6f2c0..33f4f5e 100644
--- a/leaky-ships/components/Lobby/Player.tsx
+++ b/leaky-ships/components/Lobby/Player.tsx
@@ -29,7 +29,7 @@ function Player({
       <div className="relative">
         <img className="pixelart w-64" src={"/assets/" + src} alt={src} />
         {primary ? (
-          <button className="absolute top-4 right-4  h-14 w-14 rounded-lg border-2 border-dashed border-warn bg-gray-800 bg-opacity-90">
+          <button className="absolute right-4 top-4  h-14 w-14 rounded-lg border-2 border-dashed border-warn bg-gray-800 bg-opacity-90">
             <FontAwesomeIcon
               className="h-full w-full text-warn"
               icon={faCaretDown}
diff --git a/leaky-ships/components/Lobby/SettingsFrame/Settings.tsx b/leaky-ships/components/Lobby/SettingsFrame/Settings.tsx
index 9ad9fac..309b277 100644
--- a/leaky-ships/components/Lobby/SettingsFrame/Settings.tsx
+++ b/leaky-ships/components/Lobby/SettingsFrame/Settings.tsx
@@ -30,7 +30,7 @@ function Settings({ closeSettings }: { closeSettings: () => void }) {
               Settings
             </h1>
             <button
-              className="top-6 right-6 ml-auto h-14  w-14"
+              className="right-6 top-6 ml-auto h-14  w-14"
               onClick={closeSettings}
             >
               <FontAwesomeIcon
@@ -43,7 +43,7 @@ function Settings({ closeSettings }: { closeSettings: () => void }) {
           <div className="mt-8 rounded-xl bg-zinc-600 p-8">
             <div className="flex items-center justify-end">
               <button
-                className="top-8 right-12  h-14 w-14"
+                className="right-12 top-8  h-14 w-14"
                 onClick={() => {
                   const payload = {
                     allowSpectators: true,
diff --git a/leaky-ships/components/OptionButton.tsx b/leaky-ships/components/OptionButton.tsx
index 35a27d8..f358b8e 100644
--- a/leaky-ships/components/OptionButton.tsx
+++ b/leaky-ships/components/OptionButton.tsx
@@ -21,8 +21,8 @@ function OptionButton({
       className={classNames(
         "flex w-full flex-row items-center justify-between rounded-xl py-2 pl-8 pr-4 text-lg text-grayish duration-100 first:mt-4 last:mt-4 sm:py-4 sm:pl-16 sm:pr-8 sm:text-4xl sm:first:mt-8 sm:last:mt-8",
         !disabled
-          ? "bg-voidDark border-shield-gray border-b-4 active:border-b-0 active:border-t-4"
-          : "bg-red-950 border-slate-600 border-4 border-dashed"
+          ? "border-b-4 border-shield-gray bg-voidDark active:border-b-0 active:border-t-4"
+          : "border-4 border-dashed border-slate-600 bg-red-950"
       )}
       onClick={() => action && setTimeout(action, 200)}
       disabled={disabled}
diff --git a/leaky-ships/pages/login.tsx b/leaky-ships/pages/login.tsx
index 5092af9..a2305b8 100644
--- a/leaky-ships/pages/login.tsx
+++ b/leaky-ships/pages/login.tsx
@@ -81,7 +81,7 @@ function Login() {
 
     return (
       <>
-        <div className="flex flex-col items-center rounded-3xl bg-slate-800/50 py-8 px-16 shadow-lg drop-shadow-md">
+        <div className="flex flex-col items-center rounded-3xl bg-slate-800/50 px-16 py-8 shadow-lg drop-shadow-md">
           <FontAwesomeIcon
             className={classNames("text-6xl", iconClasses[state])}
             icon={icons[state]}
diff --git a/leaky-ships/pages/logout.tsx b/leaky-ships/pages/logout.tsx
index bba625a..5269a2f 100644
--- a/leaky-ships/pages/logout.tsx
+++ b/leaky-ships/pages/logout.tsx
@@ -26,7 +26,7 @@ function Logout() {
             <span className="text-gray-300">Logging out...</span>
           </div>
           <FontAwesomeIcon
-            className="my-16 mx-24 animate-spin text-6xl"
+            className="mx-24 my-16 animate-spin text-6xl"
             icon={faSpinnerThird}
           />
         </div>