menu navigation fixes