Repositioning toolbox, small editor changes