Fixed a few problems with spacing