New toolbar to master

All python tests pass, all selenium tests pass, merge is clean after the sprint fixups.