added map, detect location button etc