add lat and lon to users
adjustments to users show
fixing merge conflict