UI REFACTORING STARTING.