UI design changes and proper handling of term mapping.

Re-organized the UI so it presents a more logical flow, and implemented
proper management of the term mapping drop-down lists.