Gh361 graphical improvements

Format