Big spacing cleanup, no neg margins top/bottom