diff --git a/src/Resources/config/routing.yml b/src/Resources/config/routing.yml
index c4d73cb8..2165586f 100644
--- a/src/Resources/config/routing.yml
+++ b/src/Resources/config/routing.yml
@@ -1,5 +1,11 @@
+bitbag_sylius_wishlist_plugin_shop_no_prefix:
+  resource: "@BitBagSyliusWishlistPlugin/Resources/config/routing/shop.yml"
+  name_prefix: 'bitbag_sylius_wishlist_plugin_shop_nolocale_'
+
 bitbag_sylius_wishlist_plugin_shop:
   resource: "@BitBagSyliusWishlistPlugin/Resources/config/routing/shop.yml"
+  name_prefix: 'bitbag_sylius_wishlist_plugin_shop_'
   prefix: /{_locale}
   requirements:
     _locale: ^[a-z]{2}(?:_[A-Z]{2})?$
+
diff --git a/src/Resources/config/routing/shop.yml b/src/Resources/config/routing/shop.yml
index 0b40037c..02d6d228 100644
--- a/src/Resources/config/routing/shop.yml
+++ b/src/Resources/config/routing/shop.yml
@@ -1,77 +1,77 @@
-bitbag_sylius_wishlist_plugin_shop_wishlist_list_products:
+wishlist_list_products:
     path: /wishlist
     methods: [GET]
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.list_wishlist_products
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_add_products:
+wishlist_add_products:
     path: /wishlist/{wishlistId}/products
     methods: [POST]
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.add_products_to_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_add_product:
+wishlist_add_product:
     path: /wishlist/add/{productId}
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.add_product_to_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_remove_product:
+wishlist_remove_product:
     path: /wishlist/remove/{productId}
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.remove_product_from_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_remove_selected_products:
+wishlist_remove_selected_products:
     path: /wishlist/{wishlistId}/products/delete
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.remove_selected_products_from_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_add_product_variant:
+wishlist_add_product_variant:
     path: /wishlist/{wishlistId}/add/variant/{variantId}
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.add_product_variant_to_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_add_selected_products:
+wishlist_add_selected_products:
     path: /wishlist/{wishlistId}/products/add
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.add_selected_products_to_cart
 
-bitbag_sylius_wishlist_plugin_shop_wishlsit_export_selected_products_to_csv:
+wishlsit_export_selected_products_to_csv:
     path: /wishlist/{wishlistId}/csv/export
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.export_selected_products_to_csv
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_import_from_csv:
+wishlist_import_from_csv:
     path: /wishlist/csv/import
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.import_from_csv
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_remove_product_variant:
+wishlist_remove_product_variant:
     path: /wishlist/{wishlistId}/remove/variant/{variantId}
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.remove_product_variant_from_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_render_header_template:
+wishlist_render_header_template:
     path: /wishlist/header-template
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.render_header_template
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_export_to_pdf:
+wishlist_export_to_pdf:
     path: /wishlist/{wishlistId}/export/pdf
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.export_wishlist_to_pdf_action
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_clean:
+wishlist_clean:
     path: /wishlist/clear/{wishlistId}
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.clean_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_create_new_wishlist:
+wishlist_create_new_wishlist:
     path: /wishlists/create
     methods: [GET, POST, DELETE]
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.create_new_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_remove_wishlist:
+wishlist_remove_wishlist:
     path: /wishlists/{id}/remove
     methods: [GET, POST, DELETE]
     defaults:
@@ -79,36 +79,36 @@ bitbag_sylius_wishlist_plugin_shop_wishlist_remove_wishlist:
         _sylius:
             csrf_protection: false
             redirect:
-                route: bitbag_sylius_wishlist_plugin_shop_wishlist_list_wishlists
+                route: wishlist_list_wishlists
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_edit_wishlist_name:
+wishlist_edit_wishlist_name:
     path: /wishlists/{id}/edit
     methods: [GET, PUT, POST]
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.update_wishlist_name_action
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_list_wishlists:
+wishlist_list_wishlists:
     path: /wishlists
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.list_wishlists
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_show_chosen_wishlist:
+wishlist_show_chosen_wishlist:
     path: /wishlists/{wishlistId}
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.show_chosen_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_add_product_to_selected_wishlist:
+wishlist_add_product_to_selected_wishlist:
     path: /wishlist/{wishlistId}/add/{productId}
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.add_product_to_selected_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_copy_selected_products_to_other_wishlist:
+wishlist_copy_selected_products_to_other_wishlist:
     path: /wishlists/{wishlistId}/copy/{destinedWishlistId}
     methods: [ POST ]
     defaults:
         _controller: bitbag_sylius_wishlist_plugin.controller.action.copy_selected_products_to_other_wishlist
 
-bitbag_sylius_wishlist_plugin_shop_wishlist_add_wishlist_to_user:
+wishlist_add_wishlist_to_user:
     path: /wishlists/{id}/save-wishlist
     methods: [GET, PUT, POST]
     defaults:
diff --git a/src/Resources/views/WishlistGroup/index.html.twig b/src/Resources/views/WishlistGroup/index.html.twig
index b3c17815..da09bfe5 100644
--- a/src/Resources/views/WishlistGroup/index.html.twig
+++ b/src/Resources/views/WishlistGroup/index.html.twig
@@ -14,7 +14,9 @@
             </h1>
         </div>
         <div class="middle aligned column">
-            <button id="create_new_wishlist_button" class="ui right floated primary  button" data-bb-wishlist-add="add-another-wishlist">
+            <button id="create_new_wishlist_button" class="ui right floated primary  button" data-bb-wishlist-add="add-another-wishlist"
+                    data-bb-wishlist-add="add-another-wishlist" data-bb-wishlist-add-url="{{ path('bitbag_sylius_wishlist_plugin_shop_wishlist_create_new_wishlist') }}"
+            >
                 {{ 'bitbag_sylius_wishlist_plugin.ui.add_another_wishlist'|trans }}
             </button>
             <input type="hidden" data-bb-csrf="{{ csrf_token('some-name') }}"/>