OP-1119 More gui