Increased organization for S7 graphics.