Fixes terms page
Merge remote branch 'origin/master'