Adjusts constraints for better button spacing.

Closes #2336