diff --git a/app/assets/javascripts/lib/items/items.js.erb b/app/assets/javascripts/lib/items/items.js.erb
index b97ceae..4fdf9ab 100755
--- a/app/assets/javascripts/lib/items/items.js.erb
+++ b/app/assets/javascripts/lib/items/items.js.erb
@@ -92,6 +92,14 @@ var Items = function(){
       }
     })
 
+    sidePanel.on("click","#status_list input[type=checkbox]",function(){
+      if($(this).is(":checked") && $(this).hasClass("checkbox-all")){
+        $(".view-page .content #status_list input[type=checkbox]").not($(this)).removeAttr("checked");
+      }else{
+        $(".view-page .content #status_list input[type=checkbox].checkbox-all").removeAttr("checked");
+      }
+    })
+
     sidePanel.on("click","#enable-menu .main-enable-parent",function(e){
       if(!$(this).is(":checked")){
         var parent = $(this).parent().parent();
@@ -163,7 +171,7 @@ var Items = function(){
 
           var controlDiv = $("<div class='controls'></div>");
           if(data.role_status.length){
-            status_list.parent().find("label.control-label").text("<%= I18n.t(:category) %> :");
+            status_list.parent().find("label.control-label").text("<%= I18n.t(:role) %> :");
             var checkbox = $("<label class='checkbox'><input type='checkbox' value='all' name='page[categories][]' class='checkbox-all' /> <%= I18n.t(:all) %> </label>");
             controlDiv.append(checkbox);
             $.each(data.role_status,function(i,category){
@@ -265,9 +273,9 @@ function customOpenSlide() {
       $('#pageslide .parent').val(_parent);
       if(_id !== 'new') {
         $('#pageslide form').attr({
-          'action': $('#pageslide form').attr('action') + '/' + _id,
-          'id': 'edit_' + _type + '_' + _id,
-          'method': 'put'
+          // 'action': $('#pageslide form').attr('action') + '/' + _id,
+          // 'id': 'edit_' + _type + '_' + _id,
+          // 'method': 'put'
         });
         setForm(element.data('form'));
       } else {
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 94c1167..0ab22a9 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -143,7 +143,7 @@ class PagesController < ApplicationController
     if module_app.key.eql?("member")
         role_status = module_app.role_status.collect do |cat|
         {
-          "title" => "#{cat.title} (#{cat.role.title})",
+          "title" => "#{cat.role.title} - #{cat.title}",
           "id" => cat.id.to_s
         }
       end
@@ -156,7 +156,7 @@ class PagesController < ApplicationController
       end
     end
 
-    role_status = role_status.nil? ? [] : role_status
+    role_status = role_status.nil? ? [] : role_status.sort_by{|status| status['title']}
     categories = categories.nil? ? [] : categories
     
     if module_app.data_count.nil?
@@ -187,7 +187,13 @@ class PagesController < ApplicationController
       @categories =  @module_app.categories rescue []
       @tags =  @module_app.tags rescue []
       if @module_app.key.eql?("member")
-        @status = @module_app.role_status rescue []
+        @status = @module_app.role_status.collect do |cat|
+                    {
+                      "title" => "#{cat.role.title} - #{cat.title}",
+                      "id" => cat.id.to_s
+                    }
+                  end
+        @status = @status.sort_by{|status| status['title']}
       else
         @status = []
       end
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_widget.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_widget.html.erb
new file mode 100644
index 0000000..0f6a068
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/announcement/_widget.html.erb
@@ -0,0 +1,24 @@
+<div class="widget-announcement wudget1">
+  <h3 class="widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <div data-level="0" data-list="announcements">
+    <div class="widget-content">
+      <div class="widget-content-inner row">
+        <div class="widget-pic resizeimg col-sm-4">
+          <img src="{{img_src}}" alt="">
+        </div>
+        <section class="widget-part col-sm-8">
+          <span class="pull-right" data-list="statuses" data-level="1">
+            <span class="label status {{status-class}}">{{status}}</span>
+          </span>
+          <span class="date"><i class="fa fa-calendar"></i> {{postdate}}</span>
+          <h4 class="widget-content-title">
+            <a href="{{link_to_show}}">{{title}}</a>
+          </h4>
+          <p class="widget-subtitle">{{subtitle}} <a class="more" href="{{link_to_show}}">Read More »</a></p>
+        </section>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/announcement/index.html.erb b/app/templates/orbit_bootstrap/modules/announcement/index.html.erb
new file mode 100644
index 0000000..e374d1d
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/announcement/index.html.erb
@@ -0,0 +1,26 @@
+<div class="index-announcement index1">
+  <h3 class="index-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <div class="row" data-level="0" data-list="announcements">
+    <div class="index-content col-sm-6">
+      <div class="index-content-inner">
+        <div class="index-pic resizeimg">
+          <img src="{{img_src}}" alt="">
+        </div>
+        <section class="index-part">
+          <h4 class="index-content-title">
+            <a href="{{link_to_show}}">{{title}}</a>
+          </h4>
+          <span class="pull-right" data-list="statuses" data-level="1">
+            <span class="label status {{status-class}}">{{status}}</span>
+          </span>
+          <span class="date"><i class="fa fa-calendar"></i> {{postdate}}</span>
+          <p class="index-subtitle">{{subtitle}}</p>
+          <a class="more" href="{{link_to_show}}">Read More »</a>
+        </section>
+      </div>
+    </div>
+  </div>
+</div>
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/faq/_widget.html.erb b/app/templates/orbit_bootstrap/modules/faq/_widget.html.erb
new file mode 100644
index 0000000..11695fd
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/faq/_widget.html.erb
@@ -0,0 +1,16 @@
+<div class="widget-faqs widget1">
+  <h3 class="widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="list-unstyled" data-list="faqs" data-level="0">
+    <li class="widget-content">
+      <a class="widget-content-title" href="{{link_to_show}}" target="_blank">{{title}}</a>
+      <span data-list="statuses" data-level="1">
+        <span class="label status {{status-class}}">{{status}}</span>
+      </span>
+    </li>
+  </ul>
+  <p class="more text-right">
+    <a class="btn btn-sm btn-info" href="{{more_url}}">More</a>
+  </p>
+</div>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/faq/index.html.erb b/app/templates/orbit_bootstrap/modules/faq/index.html.erb
new file mode 100644
index 0000000..5e8752c
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/faq/index.html.erb
@@ -0,0 +1,16 @@
+<div class="index-faqs index1">
+  <h3 class="index-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="list-unstyled" data-list="faqs" data-level="0">
+    <li class="index-content">
+      <h4>
+        <a class="index-content-title" href="{{link_to_show}}">{{question}}</a>
+        <span data-list="statuses" data-level="1">
+          <span class="label status {{status-class}}">{{status}}</span>
+        </span>
+      </h4>
+    </li>
+  </ul>
+</div>
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb b/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb
new file mode 100644
index 0000000..2e4b3d6
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb
@@ -0,0 +1,18 @@
+<div class="widget-gallery widget1">
+  <h3 class="widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <div class="cycle-slideshow widget-content"
+  data-level="0"
+  data-list="images"
+  data-cycle-slides="> a"
+  data-cycle-fx="carousel"
+  data-cycle-timeout="3000"
+  data-cycle-carousel-visible="3"
+  data-cycle-carousel-fluid="true">
+    <a class="widget-pic" href="{{link_to_show}}" target="_blank">
+      <img src="{{thumb-src}}" alt="">
+    </a>
+  </div>
+</div>
+<%= javascript_include_tag "plugin/jquery.cycle2.carousel.min"%>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/gallery/index.html.erb b/app/templates/orbit_bootstrap/modules/gallery/index.html.erb
new file mode 100644
index 0000000..43e8abd
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/gallery/index.html.erb
@@ -0,0 +1,20 @@
+<div class="index-gallery index1">
+  <h3 class="index-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <div class="row" data-level="0" data-list="albums">
+    <div class="index-content col-xs-4 col-sm-3">
+      <div class="index-content-inner">
+        <div class="index-pic">
+          <img class="img-thumbnail" src="{{thumb-src}}" alt="">
+        </div>
+        <section class="index-part">
+          <h4 class="index-content-title">
+            <a href="{{link_to_show}}">{{album-name}}</a>
+          </h4>
+        </section>
+      </div>
+    </div>
+  </div>
+</div>
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/web_resource/_widget.html.erb b/app/templates/orbit_bootstrap/modules/web_resource/_widget.html.erb
new file mode 100644
index 0000000..88e4ed3
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/web_resource/_widget.html.erb
@@ -0,0 +1,13 @@
+<div class="widget-link widget1">
+  <h3 class="widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="list-unstyled" data-level="0" data-list="web_link">
+    <li class="widget-content">
+      <a class="widget-content-title" href="{{link_to_show}}" target="_blank">{{title}}</a>
+      <span data-list="statuses" data-level="1">
+        <span class="label status {{status-class}}">{{status}}</span>
+      </span>
+    </li>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/web_resource/index.html.erb b/app/templates/orbit_bootstrap/modules/web_resource/index.html.erb
new file mode 100644
index 0000000..31d9f77
--- /dev/null
+++ b/app/templates/orbit_bootstrap/modules/web_resource/index.html.erb
@@ -0,0 +1,17 @@
+<div class="index-link index1">
+  <h3 class="index-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="list-unstyled" data-list="web_link" data-level="0">
+    <li class="index-content">
+      <h4>
+        <a class="index-content-title" href="{{link_to_show}}" target="_blank">{{title}}</a>
+        <span data-list="statuses" data-level="1">
+          <span class="label status {{status-class}}">{{status}}</span>
+        </span>
+      </h4>
+      <small class="index-context">{{context}}</small>
+    </li>
+  </ul>
+</div>
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/app/views/pages/_form.html.erb b/app/views/pages/_form.html.erb
index 6bec136..55d869d 100644
--- a/app/views/pages/_form.html.erb
+++ b/app/views/pages/_form.html.erb
@@ -1,20 +1,18 @@
-<% if params[:action] == "edit" %>
-	<h4><%= @page.name %></h4>
-<% end %>
 <div class="control-group">
 	<% if params[:action] == "new" %>
-		<label class="control-label">Page id :</label>
+		<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
 		<div class="controls">
-			<%= f.text_field :page_id, data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;"} %>
+			<%= f.text_field :page_id, class:"input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;"} %>
+			<span class="help-block"><%= t("front_page.name_field_helper") %></span>
 		</div>
 	<% end %>
 </div>
 <div class="control-group">
-	<% I18n.available_locales.each do |locale| %>
-	<label class="control-label">Page name (<%= t(locale.to_s) %>) :</label>
+	<% @site_in_use_locales.each do |locale| %>
+	<%= f.label :locale, "#{t(:title)} #{t(locale)}" %>
  	<div class="controls">
 		<%= f.fields_for :name_translations do |n| %>
-			<%= n.text_field locale, data: {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"}, :value=>@page.name_translations[locale] rescue nil %>
+			<%= n.text_field locale, class:"input-xlarge change", data: {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"}, :value=>@page.name_translations[locale] rescue nil %>
 		<% end %>
 	</div>
 	<% end %>
@@ -22,7 +20,7 @@
 <div class="control-group">
 	<label class="control-label"><%= t(:module) %> :</label>
 	<div class="controls">
-		<%= f.select(:module, @modules.map{|m| [t('module_name.'+m.key),m.key]},{:include_blank => true},:class=>"module_select", data: {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"}) %>
+		<%= f.select(:module, @modules.map{|m| [t('module_name.'+m.key),m.key]},{:include_blank => true},:class=>"module_select input-xlarge change", data: {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"}) %>
 		<%= f.hidden_field :parent_page, value: (params[:parent_page] || @page.parent_page_id) %>
 		<%= f.hidden_field :page_type, value: "page" %>
 	</div>
@@ -72,7 +70,7 @@
 </div>
 
 <div class="control-group">
-	<label class="control-label"><%= "Category List :" if params[:action] == "edit" && !@status.blank? %></label>
+	<label class="control-label"><%= t(:role)+" :" if params[:action] == "edit" && !@status.blank? %></label>
 	<div id="status_list">
 		<% if params[:action] == "edit" %>
 			<div class="controls">
@@ -84,8 +82,8 @@
 			<% end %>
 			<% @status.each do |status| %>
 					<label class="checkbox">
-						<input type="checkbox" name="page[categories][]" value="<%= status.id.to_s %>" <%= "checked='checked'" if (@page.categories.include? status.id.to_s) %> />
-						<%= status.title %>(<%= status.role.title %>)
+						<input type="checkbox" name="page[categories][]" value="<%= status['id'] %>" <%= "checked='checked'" if (@page.categories.include? status['id']) %> />
+						<%= status['title'] %>
 					</label>
 			<% end %>
 			</div>
@@ -128,7 +126,7 @@
 <div class="control-group" id="enable-menu">
 	<div class="controls">
 		<label class="control-label"><%= t(:is_published) %> :</label>
-		<% I18n.available_locales.each do |locale| %>
+		<% @site_in_use_locales.each do |locale| %>
 			<label class="checkbox">
 			  <input type="checkbox" name="page[enabled_for][]" value="<%= locale.to_s %>" class="main-enable-parent" for="<%= "checkbox_for_#{locale}" %>" <%= "checked" if @page.enabled_for.include? locale.to_s %> />
 			  <%= t(locale.to_s) %>
@@ -149,5 +147,8 @@
 	</div>
 </div>
 
+<script type="text/javascript">
+	$("#pageslide .content").css("padding","15px");
+</script>
 
 
diff --git a/app/views/pages/edit.html.erb b/app/views/pages/edit.html.erb
index 2a9125b..616384b 100644
--- a/app/views/pages/edit.html.erb
+++ b/app/views/pages/edit.html.erb
@@ -4,15 +4,16 @@
 	<% elsif params[:type] == "link" %>
 		<%= render "form_link", {:f=> f} %>
 	<% end %>
-	<div class="control-group">
-    	<div class="controls">
-			<% if params[:type] == "page" %>
-			<%= f.submit "Update Page", :class=>"btn btn-primary" %>
+	
+	<div class="form-actions">
+		<% if params[:type] == "page" %>
+			<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+      <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
 		<% elsif params[:type] == "link" %>
 			<%= f.submit "Update Link", :class=>"btn btn-primary" %>
 		<% end %>
-		</div>
 	</div>
+	
 <% end %>
 <script type="text/javascript">	
 $(document).ready(function(){
diff --git a/app/views/pages/new.html.erb b/app/views/pages/new.html.erb
index 8f84458..7358630 100644
--- a/app/views/pages/new.html.erb
+++ b/app/views/pages/new.html.erb
@@ -4,14 +4,14 @@
 	<% elsif params[:type] == "link" %>
 		<%= render "form_link", {:f=> f} %>
 	<% end %>
-	<div class="control-group">
-    	<div class="controls">
-    	<% if params[:type] == "page" %>
-			<%= f.submit "Create Page", :class=>"btn btn-primary" %>
+	
+	<div class="form-actions">
+  	<% if params[:type] == "page" %>
+			<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+      <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
 		<% elsif params[:type] == "link" %>
 			<%= f.submit "Create Link", :class=>"btn btn-primary" %>
 		<% end %>
-		</div>
 	</div>
 <% end %>
 <script type="text/javascript">