Small refactoring in UI
Opa-opa MVC style