Minor graphical rework