diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index bad57c9..58268b2 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -142,8 +142,8 @@ class PagesController < ApplicationController
     @page = Page.find(params[:id])
     @pages = Page.where(:page_id.ne => "" , :page_id.exists => true)
     @modules = ModuleApp.all.frontend_enabled
-    module_app = ModuleApp.find_by_key(@page.module);
-    @categories = module_app.categories
+    module_app = ModuleApp.find_by_key(@page.module) rescue nil
+    @categories = module_app.categories rescue []
   end
 
   def update
@@ -157,7 +157,8 @@ class PagesController < ApplicationController
   end
 
   def create
-  	@page = Page.new(page_params)
+    params['page']['page_id'] = params['page']['page_id'].gsub('-','_')
+    @page = Page.new(page_params)
     @page.save!
     respond_to do |format|
       format.js
diff --git a/app/helpers/orbit_helper.rb b/app/helpers/orbit_helper.rb
index 7a43bb6..26735aa 100644
--- a/app/helpers/orbit_helper.rb
+++ b/app/helpers/orbit_helper.rb
@@ -64,7 +64,15 @@ module OrbitHelper
       ["Home","icons-house"]
     else
       module_app = ModuleApp.where(:key => page.module).first
-      [module_app.title, module_app.get_registration.icon_class]
+      unless module_app.nil?
+        [module_app.title, module_app.get_registration.icon_class]
+      else
+        if page.module.eql? "sitemap"
+          ["sitemap", "icons-directions"]
+        else
+          ["", "icon-minus-sign"]
+        end
+      end
     end
   end
 
diff --git a/app/views/admin/items/_node.html.erb b/app/views/admin/items/_node.html.erb
index c6f9793..c98681d 100644
--- a/app/views/admin/items/_node.html.erb
+++ b/app/views/admin/items/_node.html.erb
@@ -18,13 +18,15 @@
       <% end %>
       <div class="item-menu">
         <%= link_to content_tag(:i, nil, class: "icon-eye-open"), pages_edit_view_path(:id => node.id.to_s), class: "view-page open-slide tip", title: "View", data: {title: node.name} if node.class.to_s.eql?('Page') %>
-          <%= link_to content_tag(:i, nil, class: "icon-edit"), edit_page_path(node.id), class: "open-slide tip page edit", title: "Edit Page", data: {title: "Edit Page"} if node.class.to_s.downcase.eql?("page") && !node.root? %>
+        <%= link_to content_tag(:i, nil, class: "icon-edit"), edit_page_path(node.id), class: "open-slide tip page edit", title: "Edit Page", data: {title: "Edit Page"} if node.class.to_s.downcase.eql?("page") && !node.root? %>
         <%# elsif node.class.to_s.downcase.eql?("link") %>
           <%#= link_to content_tag(:i, nil, class: "icon-edit"), "#link", class: "open-slide tip link edit", title: t('editing.link'), data: {title: t('editing.link'), id: node.id.to_s, parent: node.parent_id.to_s, form: {name: node.name}.merge(node.title_translations).merge(node.urls)} %>
         <%# end %>
+        <% unless name.eql? "sitemap" %>
         <%= link_to content_tag(:i, nil, class: "icons-newspaper"), new_page_path(:parent_page => node.id.to_s), class: "open-slide tip page", title: "Add Page", data: {title: "Add Page", id: 'new', parent: node.id.to_s} if node.class.to_s.eql?('Page') && level < 3  %>
         <%#= link_to content_tag(:i, nil, class: "icon-link"), "#link", class: "open-slide tip link", title: t(:add_link), data: {title: t(:add_link), id: 'new', parent: node.id.to_s} if node.class.to_s.eql?('Page') %>
         <%= link_to content_tag(:i, nil, class: "icon-trash"), page_path(node.id),:method => :delete,:remote => true, "data-confirm" => "Are you sure ?", class: "delete tip", title: "Delete", data: {title: "Delete"} unless node.root? %>
+        <% end %>
       </div>
     </div>
     <div class="item-info pull-right">
diff --git a/config/environment.rb b/config/environment.rb
index 138b167..da7002b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -25,6 +25,18 @@ if Page.count == 0
   home.save
 end
 
+if Page.where(:module=>"sitemap").blank?
+  sitemap = Page.new
+  sitemap.module = "sitemap"
+  sitemap.page_id = "sitemap"
+  sitemap.name_translations = {:en=>"Sitemap",:zh_tw=>"Sitemap"}
+  sitemap.enabled_for = ["en", "zh_tw"]
+  sitemap.menu_enabled_for = []
+  sitemap.url = "/sitemap"
+  sitemap.parent_page_id = Page.root.id
+  sitemap.save
+end
+
 if User.count==0
   group = Workgroup.new
   group.title = "Administrator"