UI flow improvements