[WIP] Js improvements

Tweaks to js after walkthrough with Andy T