Toolbox shouldn't be floated in the UI.
This preventing bugs and allows to correctly save geometry.
Some organizing, tiny fixes