fixing map and name layout. Adding GA