Minor cleanup
Adjusted the size of the boxes