[TASK] Refactor Navbar