Added support for up/down buttons