Map templates

Clean up Map view.