OP-1580 Fixed some visuals