added toolbar option for tab state persistance