Improved style (navigation bar most significantly)