Updates to JS and refinement of the design