Moved onclicks to JS