new layout on comm_terms and otc_calculators
merging