Add grid components variable, clean up defaults, and begin trimming width classes.