add in toolbar library
remove our Window class, we dont need it
remove old toolbar