UI and nagivation tweaks.