UI refactoring for iOS