Additions to JS and HTML