UI controller refactoring
Service refactoring