More navbar edits that worked in testing.