Additional fixes of active menu items.