added check for active menu items