Added support for axis buttons