Fixes bug with wrong verification infoWindow
Slimming down the routes
Refactoring infoWindow logic