NavBar settings text added, plus minor tweaks