diff --git a/plugins/shopping_cart/views/cart.html.erb b/plugins/shopping_cart/views/cart.html.erb
index 4656ef6..aa56dee 100644
--- a/plugins/shopping_cart/views/cart.html.erb
+++ b/plugins/shopping_cart/views/cart.html.erb
@@ -17,6 +17,6 @@
   </div>
 </div>
 
-<script type="text/javascript">
+<% javascript_tag do %>
   new Cart({hasProducts:<%= !locals[:cart].nil? ? "true, enterprise:'#{Enterprise.find(locals[:cart][:enterprise_id]).identifier}'" : "false" %>});
-</script>
+<% end %>
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
index d11d4e2..8725f95 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
@@ -15,16 +15,14 @@
       <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
     </fieldset>
     <div id="cart-form-actions">
-      <%= tag 'input',  :class => 'submit button with-text icon-send',
-                        :value => _('Send buy request'),
-                        :type => 'submit'%>
+      <%= submit_button(:send, _('Send buy request')) %>
     </div>
   <% end %>
   <%= items_table(session[:cart][:items]) %>
 </div>
 
-<script>
+<% javascript_tag do %>
   jQuery(document).ready(function(){
     jQuery("#cart-request-form").validate();
   });
-</script>
+<% end %>
--
libgit2 0.21.2