EST-404: Automatically remove terms that are out of scope; some refactoring to automatically fill the end date of a term.
EST-408: Make service charge immutable
EST-405: UI tweaks