Added support

Added support for buttons and submit buttons