Fully fixed the topbar