Fixes #26. Also, better handling of facet strip labels (draw strip on every panel, even if blank)
Merge conflicts