added toggle, onclick events