Menu bug fix

Fixed a big with the wrong menu item being highlighted