diff --git a/app/assets/javascripts/lib/items/items.js.erb b/app/assets/javascripts/lib/items/items.js.erb
index 909c278..8c5548d 100755
--- a/app/assets/javascripts/lib/items/items.js.erb
+++ b/app/assets/javascripts/lib/items/items.js.erb
@@ -219,7 +219,8 @@ var Items = function(){
                 select.append("<option value='" + layout + "'>" + layout + "</option>");
               }else if(typeof layout.length == "undefined"){
                 do_select = true;
-                select.append("<option value='" + layout.filename + "' data-image='" + layout.thumbnail + "'>" + layout.name + "</option>");
+                var name = (layout.name[data.locale] ? layout.name[data.locale] : layout.name);
+                select.append("<option value='" + layout.filename + "' data-image='" + layout.thumbnail + "'>" + name + "</option>");
               }
             })
             controlDiv.html(select);
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 51c13cd..29aad4f 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -175,9 +175,9 @@ class PagesController < ApplicationController
     categories = categories.nil? ? [] : categories
     
     if module_app.data_count.nil?
-      render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>false}}.to_json
+      render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>false}, "locale" => I18n.locale.to_s}.to_json
     else
-      render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>true,"start"=>module_app.data_count.begin, "end" => module_app.data_count.end}}.to_json
+      render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>true,"start"=>module_app.data_count.begin, "end" => module_app.data_count.end}, "locale" => I18n.locale.to_s}.to_json
     end
   end
 
diff --git a/app/views/page_parts/_widget_form.html.erb b/app/views/page_parts/_widget_form.html.erb
index fe3d9d7..537e812 100644
--- a/app/views/page_parts/_widget_form.html.erb
+++ b/app/views/page_parts/_widget_form.html.erb
@@ -4,7 +4,7 @@
 	<% if @widget_types.first.kind_of?(Hash) %>
 		<select name="page_part[sub_parts_attributes][<%= @select_number %>][widget_type]" id="page_layout" class="select2">
 				<% @widget_types.each do |lt| %>
-					<option value="<%= lt["filename"] %>" <%= ((lt["filename"] == @subpart.widget_type ? "selected=selected" : "") rescue nil) %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"] %></option>
+					<option value="<%= lt["filename"] %>" <%= ((lt["filename"] == @subpart.widget_type ? "selected=selected" : "") rescue nil) %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"][I18n.locale.to_s] rescue lt["name"] %></option>
 				<% end %>
 			</select>
 			<script type="text/javascript">
diff --git a/app/views/pages/_form.html.erb b/app/views/pages/_form.html.erb
index 6749c25..64eec44 100644
--- a/app/views/pages/_form.html.erb
+++ b/app/views/pages/_form.html.erb
@@ -124,7 +124,7 @@
 				<% if @layout_types.first.kind_of?(Hash) %>
 					<select name="page[layout]" id="page_layout" class="select2">
 						<% @layout_types.each do |lt| %>
-							<option value="<%= lt["filename"] %>" <%= (lt["filename"] == @page.layout ? "selected=selected" : "") %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"] %></option>
+							<option value="<%= lt["filename"] %>" <%= (lt["filename"] == @page.layout ? "selected=selected" : "") %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"][I18n.locale.to_s] rescue lt["name"] %></option>
 						<% end %>
 					</select>
 					<script type="text/javascript">