Added active state and corrected bugs for the indicator