little more cleanup and the very very start of adding maps

Not much here but cleans up some of the proposal UI and adds in maps. Next up: make the map do something.