Move graphics to its own class, clean up