Dropdown menu navigation fixes with PJ