Improved flow and UI