Mobile UI flow fixes