Removed jQuery dependency and avoid event handler conflict