fix generator route and navigation