UI and flow improvements