Merge "Refine UI for SUW page" into sc-dev