Fixed some errors from my merge

Cleaned up my merge.  I missed some stuff, just putting things back
where they belong.

I also temporarily added some styling to the resource template for the
Map.