Revised UI flow and design