Finished navbar changes