Fixed menu navigation issue