Navbar widgets + layout imrpovements