Huge graphical rework