UI and navigation fixes