Removed jQuery
Fix event dependency and target setup