Fix #5362 (HTML menu z-index vs. bottom-panel).

Raise toolbar +1 to be on top of the rest of the sibling panels.
Clean up

Add braces to the expression as in the rest of the definitions.
Merge pull request #5363 from busykai/fix-5362

 Fix #5362 (HTML menu z-index vs. bottom-panel)