Changed some spacing and alignment