Improved spacing and added header spacing classes