Refactoring of ui, introduced presenter