More spacing and alignment