UI migrated to MVC-pattern