Rework navigation bar content