UI-Core separation refactoring