O Morozova UI update

please move layout according to agreement, at: #280