UI and Code Refactoring