Fixed a bug with highlighting menu items