Redesign UI to follow MVP pattern more expressive