Added infoWindows and minor style tweaks