Added a wrapper for buttons.