Spruce up map selection screen.
Add 4 more beacons to test map.
Merge master.