add buttons to map, uncomment location tracking code and fix npe when location is not received, add button feature to track my current location