Refactor html and reviewed js for JQuery