enhance UI and navigation