Major rework of all things graphic