Step2 UI work