Improved user flow & UI