Edited location

Need to fix location font and add map