diff --git a/frontend/src/app/(homepage)/_components/navbar.tsx b/frontend/src/app/(homepage)/_components/navbar.tsx
index 054ea28..20da6f5 100644
--- a/frontend/src/app/(homepage)/_components/navbar.tsx
+++ b/frontend/src/app/(homepage)/_components/navbar.tsx
@@ -24,79 +24,81 @@ export const Navbar = () => {
     setIsMenuOpen(!isMenuOpen);
   };
   return (
-    <div className="relative z-50 flex h-20 items-center justify-between">
-      <Logo />
+    <div className="relative z-50 h-20 backdrop-blur-[12px] border-b border-white/10">
+      <div className="flex items-center justify-between container mx-auto">
+        <Logo />
 
-      <nav className="hidden h-20 flex-row items-center gap-10 pr-10 text-white md:flex lg:pr-40">
-        <ul className="flex gap-6">
-          <li className="cursor-pointer">
-            <a href="https://www.facebook.com/knsolvro">Aktualności</a>
-          </li>
-
-          <li className="cursor-pointer">
-            <a
-              target="_blank"
-              href="https://web.usos.pwr.edu.pl/kontroler.php?_action=news/default&panel=DOMYSLNY&file=zapisyPL.html"
-              rel="noreferrer"
-            >
-              Terminarz USOS
-            </a>
-          </li>
-          <li className="cursor-pointer">
-            <a href="https://solvro.pwr.edu.pl/contact/">Kontakt</a>
-          </li>
-          <li className="cursor-pointer">
-            <a href="https://forms.gle/4tBCPkLMFKptB1iZ7">Zgłoś błąd</a>
-          </li>
-        </ul>
-      </nav>
-
-      {/* Mobile Menu Icon */}
-      <div className="flex items-center md:hidden">
-        <button onClick={toggleMenu} className="text-white focus:outline-none">
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            className="h-8 w-8"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke="currentColor"
-          >
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth={2}
-              d="M4 6h16M4 12h16M4 18h16"
-            />
-          </svg>
-        </button>
-      </div>
-
-      {/* Mobile Menu */}
-      {isMenuOpen ? (
-        <div className="absolute left-0 top-full w-full animate-fade-in bg-mainbutton6 shadow-lg md:hidden">
-          <ul className="flex flex-col gap-4 p-4 text-center uppercase text-white">
-            <li className="cursor-pointer p-2">
+        <nav className="hidden h-20 flex-row items-center gap-10 pr-10 text-white md:flex lg:pr-40">
+          <ul className="flex gap-6">
+            <li className="cursor-pointer">
               <a href="https://www.facebook.com/knsolvro">Aktualności</a>
             </li>
-            <li className="cursor-pointer p-2">
-              <a href="https://web.usos.pwr.edu.pl/kontroler.php?_action=news/default&panel=DOMYSLNY&file=instrukcjePL.html">
-                Instrukcje
-              </a>
-            </li>
-            <li className="cursor-pointer p-2">
-              <a href="https://web.usos.pwr.edu.pl/kontroler.php?_action=news/default&panel=DOMYSLNY&file=zapisyPL.html">
-                Terminarz
+
+            <li className="cursor-pointer">
+              <a
+                target="_blank"
+                href="https://web.usos.pwr.edu.pl/kontroler.php?_action=news/default&panel=DOMYSLNY&file=zapisyPL.html"
+                rel="noreferrer"
+              >
+                Terminarz USOS
               </a>
             </li>
-            <li className="cursor-pointer p-2">
+            <li className="cursor-pointer">
               <a href="https://solvro.pwr.edu.pl/contact/">Kontakt</a>
             </li>
-            <li className="cursor-pointer p-2">
+            <li className="cursor-pointer">
               <a href="https://forms.gle/4tBCPkLMFKptB1iZ7">Zgłoś błąd</a>
             </li>
           </ul>
+        </nav>
+
+        {/* Mobile Menu Icon */}
+        <div className="flex items-center md:hidden">
+          <button onClick={toggleMenu} className="text-white focus:outline-none">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              className="h-8 w-8"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={2}
+                d="M4 6h16M4 12h16M4 18h16"
+              />
+            </svg>
+          </button>
         </div>
-      ) : null}
+
+        {/* Mobile Menu */}
+        {isMenuOpen ? (
+          <div className="absolute left-0 top-full w-full animate-fade-in bg-mainbutton6 shadow-lg md:hidden">
+            <ul className="flex flex-col gap-4 p-4 text-center uppercase text-white">
+              <li className="cursor-pointer p-2">
+                <a href="https://www.facebook.com/knsolvro">Aktualności</a>
+              </li>
+              <li className="cursor-pointer p-2">
+                <a href="https://web.usos.pwr.edu.pl/kontroler.php?_action=news/default&panel=DOMYSLNY&file=instrukcjePL.html">
+                  Instrukcje
+                </a>
+              </li>
+              <li className="cursor-pointer p-2">
+                <a href="https://web.usos.pwr.edu.pl/kontroler.php?_action=news/default&panel=DOMYSLNY&file=zapisyPL.html">
+                  Terminarz
+                </a>
+              </li>
+              <li className="cursor-pointer p-2">
+                <a href="https://solvro.pwr.edu.pl/contact/">Kontakt</a>
+              </li>
+              <li className="cursor-pointer p-2">
+                <a href="https://forms.gle/4tBCPkLMFKptB1iZ7">Zgłoś błąd</a>
+              </li>
+            </ul>
+          </div>
+        ) : null}
+      </div>
     </div>
   );
 };
\ No newline at end of file
diff --git a/frontend/src/app/(homepage)/layout.tsx b/frontend/src/app/(homepage)/layout.tsx
index cefad67..556f153 100644
--- a/frontend/src/app/(homepage)/layout.tsx
+++ b/frontend/src/app/(homepage)/layout.tsx
@@ -111,8 +111,8 @@ export default function LayoutHomePage({
         </div>
       </div>
 
+      <Navbar />
       <div className="container mx-auto">
-        <Navbar />
         {children}
         <Footer />
       </div>
diff --git a/frontend/src/app/plans/create/[id]/_components/CreateNewPlanPage.tsx b/frontend/src/app/plans/create/[id]/_components/CreateNewPlanPage.tsx
index 2d4c887..f5a1d88 100644
--- a/frontend/src/app/plans/create/[id]/_components/CreateNewPlanPage.tsx
+++ b/frontend/src/app/plans/create/[id]/_components/CreateNewPlanPage.tsx
@@ -24,6 +24,9 @@ import { faculties, lessonTypeToName } from "@/constants";
 import { usePlan } from "@/lib/usePlan";
 import { registrationReplacer } from "@/lib/utils";
 import { Day, Frequency, LessonType } from "@/services/usos/types";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import { MdArrowBack } from "react-icons/md";
 
 export default function CreateNewPlanPage({ planId }: { planId: string }) {
   const plan = usePlan({
@@ -103,30 +106,35 @@ export default function CreateNewPlanPage({ planId }: { planId: string }) {
       <div className="flex w-full max-w-[350px] flex-col items-center justify-center gap-2 px-2 md:ml-4 md:w-4/12 md:flex-col">
         <div className="flex flex-col justify-start gap-3 md:w-full">
           <div className="flex w-full items-end gap-2">
-            <form
-              className="flex w-full items-center justify-center"
-              onSubmit={(e) => {
-                e.preventDefault();
-                const formData = new FormData(e.currentTarget);
-                plan.changeName(formData.get("name")?.toString() ?? "");
-                inputRef.current?.blur();
-              }}
-            >
-              <div className="grid w-full max-w-sm items-center gap-1.5">
-                <Label htmlFor="name">Nazwa</Label>
-                <Input
-                  ref={inputRef}
-                  type="text"
-                  name="name"
-                  id="name"
-                  placeholder="Wolne poniedziałki"
-                  defaultValue={typeof window === "undefined" ? "" : plan.name}
-                  onChange={(e) => {
-                    plan.changeName(e.currentTarget.value);
-                  }}
-                />
-              </div>
-            </form>
+            <div className="flex gap-2 items-end">
+              <Link href="/plans">
+                <Button variant="outline" size="icon"><MdArrowBack size={20} /></Button>
+              </Link>
+              <form
+                className="flex w-full items-center justify-center"
+                onSubmit={(e) => {
+                  e.preventDefault();
+                  const formData = new FormData(e.currentTarget);
+                  plan.changeName(formData.get("name")?.toString() ?? "");
+                  inputRef.current?.blur();
+                }}
+              >
+                <div className="grid w-full max-w-sm items-center gap-1.5">
+                  <Label htmlFor="name">Nazwa</Label>
+                  <Input
+                    ref={inputRef}
+                    type="text"
+                    name="name"
+                    id="name"
+                    placeholder="Wolne poniedziałki"
+                    defaultValue={typeof window === "undefined" ? "" : plan.name}
+                    onChange={(e) => {
+                      plan.changeName(e.currentTarget.value);
+                    }}
+                  />
+                </div>
+              </form>
+            </div>
             <PlanDisplayLink id={plan.id} />
           </div>
         </div>
@@ -139,7 +147,7 @@ export default function CreateNewPlanPage({ planId }: { planId: string }) {
               setFaculty(v);
             }}
           >
-            <SelectTrigger className="pl-2" isLoading={registrations.isLoading}>
+            <SelectTrigger className="pl-2" disabled={registrations.isLoading}>
               <SelectValue placeholder="Wydział" />
             </SelectTrigger>
             <SelectContent className="max-w-full">
diff --git a/frontend/src/app/plans/layout.tsx b/frontend/src/app/plans/layout.tsx
index a733214..a99b50b 100644
--- a/frontend/src/app/plans/layout.tsx
+++ b/frontend/src/app/plans/layout.tsx
@@ -11,27 +11,29 @@ export default function PlansLayout({
   return (
     <div className="flex min-h-screen flex-col items-center gap-3 overflow-x-hidden">
       <div className="flex max-h-20 min-h-20 w-full items-center justify-between bg-mainbutton7">
-        <div className="ml-4 flex items-center gap-2 text-2xl font-bold text-white md:w-1/4">
-          <SolvroLogo />
-          <div className="md:hidden">Kreator</div>
-        </div>
-        <div className="hidden w-1/2 items-center justify-center font-bold text-white md:flex md:text-4xl">
-          Kreator
-        </div>
-        <div className="mr-4 flex w-1/4 items-center justify-end">
-          <Link
-            href="/plans"
-            data-umami-event="Back to plans"
-            className={cn(buttonVariants({ variant: "link" }), "text-white")}
-          >
-            <span className="text-nowrap">Moje plany</span>
-          </Link>
+        <div className="container mx-auto flex items-center justify-between">
+          <div className="ml-4 flex items-center gap-2 text-2xl font-bold text-white md:w-1/4">
+            <SolvroLogo />
+            <div className="md:hidden">Kreator</div>
+          </div>
+          <div className="hidden w-1/2 items-center justify-center font-bold text-white md:flex md:text-4xl">
+            Kreator
+          </div>
+          <div className="mr-4 flex w-1/4 items-center justify-end">
+            <Link
+              href="/plans"
+              data-umami-event="Back to plans"
+              className={cn(buttonVariants({ variant: "link" }), "text-white")}
+            >
+              <span className="text-nowrap">Moje plany</span>
+            </Link>
+          </div>
         </div>
       </div>
 
       {children}
 
-      <div className="flex w-full flex-1 items-center justify-center bg-mainbutton7 p-2">
+      <div className="flex w-full py-10 items-center justify-center bg-mainbutton7 p-2">
         <p className="text-center text-white">
           Made with ❤️ by{" "}
           <a
diff --git a/frontend/src/app/plans/page.tsx b/frontend/src/app/plans/page.tsx
index 8389293..2a850a1 100644
--- a/frontend/src/app/plans/page.tsx
+++ b/frontend/src/app/plans/page.tsx
@@ -6,7 +6,7 @@ import { useRouter } from "next/navigation";
 import { planFamily } from "@/atoms/planFamily";
 import { plansIds } from "@/atoms/plansIds";
 import { Plan } from "@/components/Plan";
-import { Button } from "@/components/ui/button";
+import { PlusIcon } from "lucide-react";
 
 const plansAtom = atom(
   (get) => get(plansIds).map((id) => get(planFamily(id))),
@@ -34,9 +34,9 @@ const Plans = () => {
   return (
     <div className="container mx-auto max-h-full flex-1 flex-grow overflow-y-auto p-4">
       <div className="flex flex-wrap items-center justify-center gap-4 sm:justify-start">
-        <div className="flex h-[200px] w-[200px] items-center justify-center rounded-lg border-2 border-dashed border-gray-400 p-4 shadow-xl">
-          <Button onClick={addNewPlan}>Dodaj nowy plan</Button>
-        </div>
+        <button onClick={addNewPlan} className="flex h-[200px] w-[200px] items-center justify-center rounded-lg border-2 border-dashed border-gray-400 p-4 shadow-xl group hover:border-primary hover:bg-primary/5 transition-colors">
+          <PlusIcon className="w-24 h-24 text-gray-400 group-hover:text-primary transition-colors" />
+        </button>
         {plans.map((plan) => (
           <Plan key={plan.id} id={plan.id} name={plan.name} />
         ))}