Add 'below' legend back to terms panel. Closes #1120. Wrap long terms in table, closes #1056
Merge remote branch 'upstream/master'