Tweaks
Merge branch 'master' of https://github.com/Bradshaw/TheBridge
Working on map