Fixed menu active indicator issues.