30411: port sprint6 JS

* Port sprint6 JS changes into vanilla
* Update views for toolbox changes