Fixed conflicts with function names, fixed onclick