Minor graphical reworks