Tab order & Amended Step progression UI