Map

Added basic formatting and extra fields to map popup