Add more tweaks to js and html to make this work