#961 Improve navigation bar