Minor fixes on navigation and UI