Improve buttons.