UI Refactor complete.