Toolbox tweaks
js fixes