ported graphical modifications from master