Changed classes and click function to be more responsive to Angular