Added map activity
Added location activitz handling