Fixed issues with spacing between boxes