Added support for buttons in the top-bar menu