Changed definitino of menubar class