More graphical issue fixes