fixed conflicts now up to date with options class and all of base menu