diff --git a/app/helpers/admin/ad_banners_helper.rb b/app/helpers/admin/ad_banners_helper.rb
index df0d3e73..b97f49cd 100644
--- a/app/helpers/admin/ad_banners_helper.rb
+++ b/app/helpers/admin/ad_banners_helper.rb
@@ -28,4 +28,4 @@ module Admin::AdBannersHelper
 
 
 
-end
\ No newline at end of file
+end
diff --git a/app/helpers/admin/items_helper.rb b/app/helpers/admin/items_helper.rb
index 948df59c..6069fd69 100644
--- a/app/helpers/admin/items_helper.rb
+++ b/app/helpers/admin/items_helper.rb
@@ -32,7 +32,7 @@ module Admin::ItemsHelper
     if !parent.children.entries.blank?
       ret = ''
       ret << "<ol class='#{'sortable' if parent.parent.nil?}'>"
-      children.each do |child|
+      children.reverse.each do |child|
         ret << render_node_and_children(child)
       end
       ret << '</ol>'
diff --git a/app/views/admin/items/_site_map_left_bar.html.erb b/app/views/admin/items/_site_map_left_bar.html.erb
index 6307e5aa..282f3ea2 100644
--- a/app/views/admin/items/_site_map_left_bar.html.erb
+++ b/app/views/admin/items/_site_map_left_bar.html.erb
@@ -3,4 +3,4 @@
 </ol>
 <script type="text/javascript">
 	bindTreeDragHandle();
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index e7de0ebc..d14a3d5d 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -1,83 +1,83 @@
 <header id="orbit-bar" class="navbar">
-	<div class="navbar-inner">
-		<div class="container clear">
-			<div class="dropdown orbit-logo pull-left">
-			    <% if !current_user.nil?  %>
-			    		<%= render :partial=>"layouts/member_orbit_menu"%>
-			    <% else %>
-			    		<%= render :partial=>"layouts/guest_orbit_menu"%>
-			    <% end -%>
-			</div>
-			<ul class="nav">
-				<li><%= link_to '', root_path, {'data-icon' => 'house'} %></li>
-				<!-- <li><%= link_to '', desktop_path, {'data-icon' => 'desktop'} %></li> -->
-			</ul>
-			<ul class="nav pull-right">
-        <li class="dropdown language">
-          <a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icon="earth"></a>
-          <ul class="dropdown-menu language-menu">
-            <% @site_in_use_locales.each do |locale| %>
-	            <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
-	          <% end %>
-          </ul>
+<div class="navbar-inner">
+  <div class="container clear">
+    <div class="dropdown orbit-logo pull-left">
+      <% if !current_user.nil?  %>
+        <%= render :partial=>"layouts/member_orbit_menu"%>
+      <% else %>
+        <%= render :partial=>"layouts/guest_orbit_menu"%>
+      <% end -%>
+    </div>
+    <ul class="nav">
+      <li><%= link_to '', root_path, {'data-icon' => 'house'} %></li>
+      <!-- <li><%= link_to '', desktop_path, {'data-icon' => 'desktop'} %></li> -->
+    </ul>
+    <ul class="nav pull-right">
+      <li class="dropdown language">
+      <a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icon="earth"></a>
+      <ul class="dropdown-menu language-menu">
+        <% @site_in_use_locales.each do |locale| %>
+          <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
+        <% end %>
+      </ul>
+      </li>
+      <li class="search clear" title="<%= t :search_google %>">
+      <a class="orbit-bar-search" href="#" data-icon="search"></a>
+      <form class="navbar-search" method="get" action="http://www.google.com/custom">
+        <input type="hidden" name="client" value="pub-&amp" /> 
+        <input type="hidden" name="ie" id="ie" value="utf-8" />
+        <input type="hidden" name="oe" id="oe" value="utf-8" />
+        <input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
+        <input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
+        <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
+        <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_google) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
+      </form>
+      </li>
+      <% if user_signed_in? %>
+        <li class="dropdown active">
+        <a class="orbit-bar-account" href="#" data-toggle="dropdown">
+          <img class="member-img" src="/assets/person.png" />
+          <%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
+          <span class="member-name"><%= current_user.name %></span>
+        </a>
+        <ul class="dropdown-menu account-menu">
+          <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' +  t(:account_setting), desktop_path+"#settings-account" %></li> -->
+          <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-desktop') + ' ' +  t(:desktop), desktop_path %></li> -->
+          <li><%= link_to content_tag(:i, nil, :class => 'icons-outlog') + ' ' +  t(:logout), destroy_user_session_path %></li>
+          <li class="divider"></li>
+          <li>
+          <a href="#">
+            <i class="icons-help"></i>
+            <%= t(:help) %>
+          </a>
+          </li>
+        </ul>
         </li>
-        <li class="search clear" title="<%= t :search_google %>">
-          <a class="orbit-bar-search" href="#" data-icon="search"></a>
-					<form class="navbar-search" method="get" action="http://www.google.com/custom">
-  					<input type="hidden" name="client" value="pub-&amp" /> 
-  					<input type="hidden" name="ie" id="ie" value="utf-8" />
-  					<input type="hidden" name="oe" id="oe" value="utf-8" />
-  					<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
-  					<input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
-            <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
-            <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
-  	      </form>
-        </li>
-				<% if user_signed_in? %>
-					<li class="dropdown active">
-						<a class="orbit-bar-account" href="#" data-toggle="dropdown">
-							<img class="member-img" src="/assets/person.png" />
-							<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
-							<span class="member-name"><%= current_user.name %></span>
-						</a>
-						<ul class="dropdown-menu account-menu">
-              <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' +  t(:account_setting), desktop_path+"#settings-account" %></li> -->
-							<!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-desktop') + ' ' +  t(:desktop), desktop_path %></li> -->
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-outlog') + ' ' +  t(:logout), destroy_user_session_path %></li>
-							<li class="divider"></li>
-							<li>
-								<a href="#">
-									<i class="icons-help"></i>
-									<%= t(:help) %>
-								</a>
-							</li>
-						</ul>
-					</li>
-				<% else %>
-					<li class="dropdown bar-login">
-						<a class="dropdown-toggle orbit-bar-member" href="#" data-icon="inlog"></a>
-						<div class="dropdown-menu">
-							<ul class="log">
-								<li class="title hide"></li>
-								
-								<%= form_for :user, :url => user_session_path do |f| %>
-									<li>
-										<div class="input-prepend">
-											<span class="add-on"><i class="icon-user"></i></span>
-											<%= f.text_field :email, :class => 'span2', :placeholder => t(:email), :size => 16 %>
-										</div>
-									</li>
-									<li>
-										<div class="input-prepend">
-											<span class="add-on"><i class="icon-lock"></i></span>
-										  <%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
-										</div>
-									</li>
-									<li class="clear hide">
-										<%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
-									</li>
-									<li>
-										<%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
+      <% else %>
+        <li class="dropdown bar-login">
+        <a class="dropdown-toggle orbit-bar-member" href="#" data-icon="inlog"></a>
+        <div class="dropdown-menu">
+          <ul class="log">
+            <li class="title hide"></li>
+
+            <%= form_for :user, :url => user_session_path do |f| %>
+              <li>
+              <div class="input-prepend">
+                <span class="add-on"><i class="icon-user"></i></span>
+                <%= f.text_field :email, :class => 'span2', :placeholder => t(:email), :size => 16 %>
+              </div>
+              </li>
+              <li>
+              <div class="input-prepend">
+                <span class="add-on"><i class="icon-lock"></i></span>
+                <%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
+              </div>
+              </li>
+              <li class="clear hide">
+              <%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
+              </li>
+              <li>
+              <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
 
               </li>
               <li class="divider hide"><span><%= t(:or_lower) %></span></li>
diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb
index 3abeeddd..4f1e6fd2 100644
--- a/lib/orbit_core_lib.rb
+++ b/lib/orbit_core_lib.rb
@@ -140,7 +140,7 @@ module  OrbitCoreLib
     
     protected
      def generate_token
-       self.s_token = ActiveSupport::SecureRandom.hex(16)
+       self.s_token = SecureRandom.hex(16)
        self.save!
      end
   end