Better layout for the nav-bar