Change "Event Listener" insertion

Replace "onload" and "onlclick" by proper event listener