Updated Ui code for step1 and step3.