Put grade and term in one line

closes #423