more UI flow improvements