Altered to make toolbar totally invisible if not used

Wrapped entire block in if statement as opposed to using same statement
within the block-toolbar