More changes to Nav-bar