Added map-wrapper to deal with ipads.