Move box-sizing into .container-grid / minor mods