MODE-1820: Rework of GUI