Start cleaning up and fix map background