Refactoring: Simple UI changes