Pretty up some spacing and margins