Added address in the InfoWindow textbox. More refactoring