Preparing for contribution data, cleaning map UI, #142, #143