diff --git a/app/models/design/layout.rb b/app/models/design/layout.rb
index 8755b099..817ebc5e 100644
--- a/app/models/design/layout.rb
+++ b/app/models/design/layout.rb
@@ -27,7 +27,7 @@ class Layout < DesignFile
   end
 
   def save_pages
-    self.design.pages.each(&:save)
+    self.design.pages.each(&:generate_parts)
   end
   
 end
diff --git a/app/models/page.rb b/app/models/page.rb
index bee0700b..404e486f 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -26,26 +26,30 @@ class Page < Item
   
   # embeds_many :custom_images, :class_name => 'Image', as: :design_image
   
+  def generate_parts
+    page_design = self.design
+    parent = self.parent
+    menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
+    page_design.layout.layout_parts.each do |layout_part|
+      current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
+      current_part = self.page_parts.build(:name => layout_part.name) unless current_part
+      if menu_part && current_part.name.eql?(menu_part.name)
+        if current_part.new_record?
+          current_part.kind = menu_part.kind
+          current_part.public_r_tag = menu_part.public_r_tag
+          current_part.public_r_tag_object_id = menu_part.public_r_tag_object_id
+        else
+          current_part.update_attributes(:kind => menu_part.kind, :public_r_tag => menu_part.public_r_tag, :public_r_tag_object_id => menu_part.public_r_tag_object_id)
+        end
+      end
+    end
+  end
+
   protected
   
   def create_parts
     if self.new_record? || self.design_id_changed?
-      page_design = self.design
-      parent = self.parent
-      menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
-      page_design.layout.layout_parts.each do |layout_part|
-        current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
-        current_part = self.page_parts.build(:name => layout_part.name) unless current_part
-        if menu_part && current_part.name.eql?(menu_part.name)
-          if current_part.new_record?
-            current_part.kind = menu_part.kind
-            current_part.public_r_tag = menu_part.public_r_tag
-            current_part.public_r_tag_object_id = menu_part.public_r_tag_object_id
-          else
-            current_part.update_attributes(:kind => menu_part.kind, :public_r_tag => menu_part.public_r_tag, :public_r_tag_object_id => menu_part.public_r_tag_object_id)
-          end
-        end
-      end
+      generate_parts
     end
   end