Better layout for maps. Fixes #7.