Added option to auto enable toolbars