Fix spot popup with deals and refactor routebuilder