More attempts at fixing the menu...