Added tool bar and various other things