Added ability to disable toolbar (to use the basic functions without the bar)