UI refactoring for two projects