Fixing nav-push-pages, updating infowindow structure