Feature/enhance mobile map info