Fixed many bugs in spacing