Added border around terms.
Rearranged the term in the proper order.