More fixes to menus, fixed some file not found errors.