finished first version of the Terms component and cleaned up some left overs from the component refactoring (#556)