clean up, fixed error with users in JS, clean up html n JS.