ART-1157: UI aspects added