updated UI and navigation