Improved user input flow