Improve button borders.
Improve disabled button state.