Fix side menu and new look top bar