Improved layout of navigation bar