Added if check for active class