start to refactor mapping form, tiny enhancements to mapping show/list view