small navigation and UI tidy ups