Eldar: Menu Navigation Fix bugs

Fix some bugs and Add Menu Header