Fixed my own typo. Fixed conditionals for block-grid margin and padding.