More spacing and indent adjustments