Changes to UI - Code Refactoring