Merge pull request #2098 from ussuri/sort-out-tabbing-order

Follow-up to sorting out the tabbing order
Missed a few changes
Merge pull request #2104 from ussuri/enabled-disabled-for-spark-button

Missed a few changes
Minor fix