Moved toolbar code

Started moving toolbar stuff to tabview.