OP-984 Some gui fiddling.