More navigation and UI fixes.
Minor fix.