Eldar: Menu Navigation - Fix all BUGS

Fix all BUGS
Rearchitect code