User flow improvements