Adjusting the behavior of the nav bar
Some minor UI adjustments