Fix UI and navigation