fixed some issues with spacing and margins