Menu Navigation fixes
Freez