Improved rendering of buttons.