Attempted more toolbar fixes