Finished toolbar rework