Some graphic overhaul