Better spacing and tab functionality