Restructure the column width definitions to use margins instead of padding.
Fix typo for .col-2-3 width.