Refactoring UI classes around