minor page flow fixes