Switched over from onclicks for some classes