Updates to HTML and removal of Javascript