Spacing and button adjustments