Fix issue with custom icons not displaying (remove outdate google maps
code), and minor tweaks.