fixed remaining more toolbar issues