Merged with UI Refactoring