Fixed Problems with spacing