UI - Step1/3 related code changes;