Added ability to add buttons