Added support for the buttons on the right