Removed custom header, changed the JavaScript and more