#4368: Moved buttons to menuBar

like a+b