UI Refactor
Merge