Connected toolbar stuff, fixed redraw issues