Case 435: UI Refactoring