Added terms panel, deprecated pie panel