Fix a bad bug.
Fix margins.
More margin work.