toolbar half done
updates
after merge