Fix menus and menubars