[Refactoring] Re-design UI