diff --git a/app/views/admin/pages/_show.html.erb b/app/views/admin/pages/_show.html.erb
index 1937fe92d..ba9bcf48a 100644
--- a/app/views/admin/pages/_show.html.erb
+++ b/app/views/admin/pages/_show.html.erb
@@ -1,3 +1,7 @@
 <%= flash_messages %>
 
-<%= parse_page_edit(@item).html_safe %>
\ No newline at end of file
+
+<%= page_stylesheets(@item).html_safe %> 
+<%= page_javascripts(@item).html_safe %> 
+
+<%= parse_page_edit_noko(@item).html_safe %>
\ No newline at end of file
diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb
index 787f579b3..3e6411182 100644
--- a/lib/parsers/parser_back_end.rb
+++ b/lib/parsers/parser_back_end.rb
@@ -1,132 +1,86 @@
 module ParserBackEnd
-  require 'radius'
   include ParserCommon
-  
-  def parse_page_edit(page)
-    if page._type == 'Page'
-      layout_content = page.design.layout.content.force_encoding('UTF-8') rescue ''
-      context = parser_context_edit(page)
-      parser = Radius::Parser.new(context, :tag_prefix => 'r')
-      parser.parse(parser.parse(layout_content))
+
+  require 'nokogiri'
+
+      # c.define_tag 'language_bar' do
+      #   @site.in_use_locales.map{ |locale|
+      #     lang = I18nVariable.first(:conditions => {:key => locale})[locale]
+      #     if I18n.locale.to_s.eql?(locale)
+      #       lang
+      #     else
+      #       "<a href='?locale=#{locale}'>#{lang}</a>"
+      #     end
+      #   }.join(' | ')
+      # end
+      # c.define_tag 'link' do |tag|
+      #   item = Item.first(:conditions => { :full_name => tag.attr['name'] })
+      #   ret = ''
+      #   ret << "<a href='"
+      #   ret << eval("admin_#{item._type.downcase}_path(item.id)")
+      #   ret << "' class='nav'>"
+      #   ret << item.i18n_variable[I18n.locale]
+      #   ret << "</a>"
+      # end
+
+  def parse_page_edit_noko(page, id = nil)
+    body = Nokogiri::HTML(page.design.layout.body)
+    parse_menu(body, page, true)
+    public_r_tags = parse_contents(body, page, id)
+    parse_images(body, page)
+
+    public_r_tags.each do |tag|
+      send("parse_#{tag}s", body, page,id)
     end
+
+    body.to_html
   end
-  
-  def parser_context_edit(page, attributes = {})
-    Radius::Context.new do |c|
-      c.define_tag 'ad_banner' do |tag|
-        res = ''
-        ad_banner = AdBanner.find(tag.attr["id"]) rescue nil
-        if ad_banner
-          res << "<script type='text/javascript'>
-                    $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({delay: -1000, fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}', timeoutFn: getTimeout }); });
-                    </script>"
-          res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
-          ad_banner.ad_images.each do |ad_image|
-            res << "<img src='#{ad_image.file}' "
-            res << "alt='#{ad_image.picture_intro || ' '}' "
-            res << "time_to_next='#{ad_image.get_delay_time}' "
-            res << "link_open='#{ad_image.link_open}' "
-            res << "link_url='#{(ad_banner.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
-            res << "/>"
-          end
-          res << "</div>"
-        end
-      end
-      c.define_tag 'content' do |tag|
-        ret = ''
-        if (tag.attributes["main"] == "true" && !page.module_app.nil?)
-          ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}?inner=true&page_id=#{page.id}"
-          ret << "&category_id=#{page.category}" if page[:category]
-          ret << "'></div>"
-        else
-          part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
-          ret << "<div id='#{tag.attr['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>"
-          ret << "<div class='edit_link' style='display:none'>"
-          ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>"
-          ret << '</div>'
-          case part.kind
-            when 'text'
-              ret << part.i18n_variable[I18n.locale] rescue ''
-            when 'module_widget'
-              if part[:category]
-                ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}?category_id=#{part[:category]}'></div>"
-              else
-                ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}'></div>"
-              end
-            when 'public_r_tag'
-              ret << "<r:#{part.public_r_tag} id='#{part.public_r_tag_object_id}'/>"
-            else
-              ''
-          end
-          ret << '</div>'
-        end
-      end      
-      c.define_tag 'image' do |tag|
-        # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
-        # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
-        image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
-        if image
-          res = "<img src=#{image.file.url} "
-          tag.attr.each do |l|
-            res << "#{l[0]}='#{l[1]}' "
-          end
-          res << '>'
-        end
-      end
-      c.define_tag 'javascripts' do |tag|
-        res = ''
-        res << "<script type='text/javascript' src='/static/jquery.js'></script>"
-        res << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>"
-        res << "<script type='text/javascript' src='/static/kernel.js'></script>"
-        res << "<script type='text/javascript' src='/assets/event.js'></script>"
-        page.design.javascripts.each do |js|
-          res << "<script type='text/javascript' src='#{js.file.url}'></script>"
-        end
-        res
-      end
-      c.define_tag 'language_bar' do
-        @site.in_use_locales.map{ |locale|
-          lang = I18nVariable.first(:conditions => {:key => locale})[locale]
-          if I18n.locale.to_s.eql?(locale)
-            lang
+
+  # page_contents
+  def parse_contents(body, page, id)
+    public_r_tags = []
+    body.css('.page_content').each do |content|
+      ret = ''
+      if (content["main"] == "true" && !page.module_app.nil?)
+        ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}?inner=true&page_id=#{page.id}"
+        ret << "&category_id=#{page.category}" if page[:category]
+        ret << "'></div>"
+      else
+        part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
+        ret << "<div id='#{tag.attr['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>"
+        ret << "<div class='edit_link' style='display:none'>"
+        ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>"
+        ret << '</div>'
+        case part.kind
+        when 'text'
+          ret << part.i18n_variable[I18n.locale] rescue ''
+        when 'module_widget'
+          if part[:category]
+            ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}?category_id=#{part[:category]}'></div>"
           else
-            "<a href='?locale=#{locale}'>#{lang}</a>"
+            ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}'></div>"
           end
-        }.join(' | ')
+        when 'public_r_tag'
+          ret << "<r:#{part.public_r_tag} id='#{part.public_r_tag_object_id}'/>"
+          public_r_tags << part.public_r_tag
+        else
+            ''
+        end
       end
-      c.define_tag 'link' do |tag|
-        item = Item.first(:conditions => { :full_name => tag.attr['name'] })
-        ret = ''
-        ret << "<a href='"
-        ret << eval("admin_#{item._type.downcase}_path(item.id)")
-        ret << "' class='nav'>"
-        ret << item.i18n_variable[I18n.locale]
-        ret << "</a>"
-      end
-      c.define_tag 'menu' do |tag|
-        home = get_homepage
-        menu = page.design.layout.menu
-        menu_level(home, 0, menu, true)
-      end
-      c.define_tag 'meta' do |tag|
-        "<meta name='bob' content=#{@site.school} />"
-      end
-      c.define_tag 'stylesheets' do |tag|
-        res = ''
-        res << "<link href='#{page.design.reset_css.file.url}' rel='stylesheet' type='text/css' />" if page.design.reset_css
-        res << "<link href='#{page.design.default_css.file.url}' rel='stylesheet' type='text/css' />" if page.design.default_css
-        theme = page.design.themes.detect{ |d| d.id == page.theme_id  }
-        res << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />" if theme
-        res
-      end
-      c.define_tag 'title' do |tag|
-        "<title>#{page.title ? page.title : page.i18n_variable[I18n.locale]}</title>"
+      scope = "<#{content.name}"
+      content.attributes.each_pair do |key, value|
+        scope << " #{key}='#{value}'"
       end
+      scope << ">#{ret}</#{content.name}>"
+      fragment = Nokogiri::HTML::DocumentFragment.new(body, scope)
+      content.swap(fragment)
     end
+    public_r_tags.uniq
   end
-  
+
+
   def self.included(base)
-    base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method
+    base.send :helper_method, :parse_page_edit_noko if base.respond_to? :helper_method
   end
 
 end
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 8d43c0709..96cbb4b98 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -44,4 +44,56 @@ module ParserCommon
     res << "</li>"
   end
 
+  # ad_banners
+  def parse_ad_banners(body = nil, page = nil, id = nil)
+    body.css('ad_banner').each do |banner|
+      res = ''
+      ad_banner = AdBanner.find(banner["id"]) rescue nil
+      if ad_banner && ad_banner.display?
+        res << "<script type='text/javascript'>
+                $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({delay: -1000, fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}', timeoutFn: getTimeout }); });
+                </script>"
+        res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
+         ad_banner.ad_images.each do |ad_image|
+           res << "<img src='#{ad_image.file}' "
+           res << "alt='#{ad_image.picture_intro || ' '}' "
+           res << "time_to_next='#{ad_image.get_delay_time}' "
+           res << "link_open='#{ad_image.link_open}' "
+           res << "link_url='#{(ad_banner.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
+           res << "/>"
+          end
+        res << "</div>"
+      end
+      fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+      banner.swap(fragment)
+    end
+  end
+
+  # page_images
+  def parse_images(body, page)
+    body.css('.page_image').each do |page_image|
+      # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
+      # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
+      image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image
+      if image
+        res = "<img src=#{image.file.url} "
+        page_image.attributes.each do |l|
+          res << "#{l[0]}='#{l[1]}' "
+        end
+        res << '>'
+      end
+      fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+      page_image.swap(fragment)
+    end
+  end
+
+  # page_menu
+  def parse_menu(body, page, edit=nil)
+    page_menu = body.css('.page_menu').first
+    home = get_homepage
+    menu = page.design.layout.menu
+    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, true))
+    page_menu.swap(fragment)
+  end
+
 end
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 529802ffb..c3ca17870 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -1,113 +1,42 @@
 module ParserFrontEnd
-  require 'radius'
   include ParserCommon
-
-  def parser_context(page, attributes = {}, id = nil)
-    Radius::Context.new do |c|
-      c.define_tag 'ad_banner' do |tag|
-        res = ''
-        ad_banner = AdBanner.find(tag.attr["id"]) rescue nil
-        if ad_banner && ad_banner.display?
-          res << "<script type='text/javascript'>
-                  $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({delay: -1000, fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}', timeoutFn: getTimeout }); });
-                  </script>"
-          res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
-           ad_banner.ad_images.each do |ad_image|
-             res << "<img src='#{ad_image.file}' "
-             res << "alt='#{ad_image.picture_intro || ' '}' "
-             res << "time_to_next='#{ad_image.get_delay_time}' "
-             res << "link_open='#{ad_image.link_open}' "
-             res << "link_url='#{(ad_banner.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
-             res << "/>"
-            end
-          res << "</div>"
-        end
-        res
-      end
-      c.define_tag 'content' do |tag|
-        ret = ''
-        if (tag.attributes["main"] == "true" && !page.module_app.nil?)
-          ret << "<div id='appfrontend' class='dymanic_load' path='/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}"
-          ret << "/#{id}" if id
-          ret << "?inner=true&page_id=#{page.id}"
-          ret << "&category_id=#{page.category}" if page[:category]
-          ret << "'></div>"
-        else
-          part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
-          case part.kind
-          when 'text'
-            ret << part.i18n_variable[I18n.locale] rescue ''
-          when 'module_widget'
-            if part[:category]
-              ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true&category_id=#{part[:category]}'></div>"
-            else
-              ret << "<div class='dymanic_load' path='/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true'></div>"
-            end
-          when 'public_r_tag'
-            ret << "<r:#{part.public_r_tag} id='#{part.public_r_tag_object_id}'/>"
-          else
-              ''
-          end
-        end
-        ret
-      end
-      c.define_tag 'image' do |tag|
-        # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
-        # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
-        image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
-        if image
-          res = "<img src=#{image.file.url} "
-          tag.attr.each do |l|
-            res << "#{l[0]}='#{l[1]}' "
-          end
-          res << '>'
-        end
-      end
-      c.define_tag 'language_bar' do
-        @site.in_use_locales.map{ |locale|
-          lang = I18nVariable.first(:conditions => {:key => locale})[locale]
-          if I18n.locale.to_s.eql?(locale)
-            lang
-          else
-            "<a href='?locale=#{locale}'>#{lang}</a>"
-          end
-        }.join(' | ')
-      end
-      c.define_tag 'link' do |tag|
-        item = Item.first(:conditions => { :full_name => tag.attr['name'] })
-        ret = ''
-        ret << "<a href='#{tag.attr['name']}'>"
-        ret << item.i18n_variable[I18n.locale]
-        ret << '</a>'
-      end
-      c.define_tag 'menu' do |tag|
-        home = get_homepage
-        menu = page.design.layout.menu
-        menu_level(home, 0, menu)
-      end
-    end
-  end
-  
-  def parse_page(page, id = nil)
-    if page._type == 'Page'
-      context = parser_context(page, {}, id)
-      parser = Radius::Parser.new(context, :tag_prefix => 'r')
-      parser.parse(parser.parse(page.design.layout.body))
-    end
-  end
-  
-  def self.included(base)
-    base.send :helper_method, :parse_page if base.respond_to? :helper_method
-  end
-
-
+    #   c.define_tag 'language_bar' do
+    #     @site.in_use_locales.map{ |locale|
+    #       lang = I18nVariable.first(:conditions => {:key => locale})[locale]
+    #       if I18n.locale.to_s.eql?(locale)
+    #         lang
+    #       else
+    #         "<a href='?locale=#{locale}'>#{lang}</a>"
+    #       end
+    #     }.join(' | ')
+    #   end
+    #   c.define_tag 'link' do |tag|
+    #     item = Item.first(:conditions => { :full_name => tag.attr['name'] })
+    #     ret = ''
+    #     ret << "<a href='#{tag.attr['name']}'>"
+    #     ret << item.i18n_variable[I18n.locale]
+    #     ret << '</a>'
+    #   end
+    # end
 
   require 'nokogiri'
 
   def parse_page_noko(page, id = nil)
     body = Nokogiri::HTML(page.design.layout.body)
+    parse_menu(body, page)
+    public_r_tags = parse_contents(body, page, id)
+    parse_images(body, page)
 
-    # page_contents
+    public_r_tags.each do |tag|
+      send("parse_#{tag}s", body, page,id)
+    end
+
+    body.to_html
+  end
+
+  # page_contents
+  def parse_contents(body, page, id)
+    public_r_tags = []
     body.css('.page_content').each do |content|
       ret = ''
       if (content["main"] == "true" && !page.module_app.nil?)
@@ -129,6 +58,7 @@ module ParserFrontEnd
           end
         when 'public_r_tag'
           ret << "<r:#{part.public_r_tag} id='#{part.public_r_tag_object_id}'/>"
+          public_r_tags << part.public_r_tag
         else
             ''
         end
@@ -141,54 +71,7 @@ module ParserFrontEnd
       fragment = Nokogiri::HTML::DocumentFragment.new(body, scope)
       content.swap(fragment)
     end
-
-    # page_menu
-    page_menu = body.css('.page_menu').first
-    home = get_homepage
-    menu = page.design.layout.menu
-    fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu))
-    page_menu.swap(fragment)
-
-    # page_image
-    body.css('.page_image').each do |page_image|
-      # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
-      # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
-      image = page.design.images.detect{|image| image.name.eql?(page_image['name']) } unless image
-      if image
-        res = "<img src=#{image.file.url} "
-        page_image.attributes.each do |l|
-          res << "#{l[0]}='#{l[1]}' "
-        end
-        res << '>'
-      end
-      fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
-      page_image.swap(fragment)
-    end
-
-    # ad_banner
-    body.css('ad_banner').each do |banner|
-      res = ''
-      ad_banner = AdBanner.find(banner["id"]) rescue nil
-      if ad_banner && ad_banner.display?
-        res << "<script type='text/javascript'>
-                $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({delay: -1000, fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}', timeoutFn: getTimeout }); });
-                </script>"
-        res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
-         ad_banner.ad_images.each do |ad_image|
-           res << "<img src='#{ad_image.file}' "
-           res << "alt='#{ad_image.picture_intro || ' '}' "
-           res << "time_to_next='#{ad_image.get_delay_time}' "
-           res << "link_open='#{ad_image.link_open}' "
-           res << "link_url='#{(ad_banner.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
-           res << "/>"
-          end
-        res << "</div>"
-      end
-      fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
-      banner.swap(fragment)
-    end
-
-    body.to_html
+    public_r_tags.uniq
   end
   
 end