Items in the toolbar are now positioned more intelligently