Simplify map preview

Don't merge. This serves as a reminder to me that i've been working on this. Perhaps someone else feels like looking over these changes, IIRC I already got some feedback on IRC.