Rework map, forms and translations.