More fixes for the menu