Fixed issue with selected navigator menu items