Fix bug where using .nb or .na removed the margin, but did not update th...

...e width to compensate

Conflicts:
	css/grids.css