- Refactor and cleaned up UI.