Improve menu navigation

Add menu navigation