SSP-795 Improved layout (not perfect) for Map terms