Updates to JS and load order