Added active menu tracking