fix some more toolbar issues