toolbar rework