diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb
index 7af6d98..f7bc45c 100644
--- a/app/helpers/orbit_backend_helper.rb
+++ b/app/helpers/orbit_backend_helper.rb
@@ -150,6 +150,10 @@ module OrbitBackendHelper
     end
   end
 
+  def is_user_sub_manager?
+    @current_user_is_sub_manager
+  end
+
   def has_access? #@user_has_privileges comes from orbit_member_controller.. used just in members
     @user_has_privileges
   end
diff --git a/app/models/site.rb b/app/models/site.rb
index 139bd27..4640a20 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -9,6 +9,7 @@ class Site
   field :address, type: String
   field :footer, localize: true
   field :sub_menu, localize: true
+  field :site_type
   field :site_map_link, type: String, :default => "/sitemap"
   field :terms_of_use_link, type: String
   field :google_analytics, type: String
diff --git a/app/templates/orbit_bootstrap/assets/javascripts/app.js b/app/templates/orbit_bootstrap/assets/javascripts/app.js
index d8f443c..c275461 100644
--- a/app/templates/orbit_bootstrap/assets/javascripts/app.js
+++ b/app/templates/orbit_bootstrap/assets/javascripts/app.js
@@ -4,9 +4,28 @@
 
     // Init functions
     function init () {
+        // Announcement modules
+        var annc = {
+            truncation : function (el, maxLength) {
+                for( var i = 0; i < el.length; i ++ ) {
+                    if ( el[i].firstChild !== null ) {
+                        if( el[i].firstChild.length > maxLength ) {
+                            var newTitle = el[i].firstChild.nodeValue;
+                            var newTitle = newTitle.substring(0, maxLength) + '...'
+                            el
+                                .eq(i)
+                                .text(newTitle);
+                        }
+                    }
+                }
+            }
+        }
 
-        var utils = {
-            
+        function anncFix() {
+            var w$ = $('.w-announcement-4');
+            if( w$.length ) {
+                annc.truncation(w$.find('.w-annc__subtitle'), 25);
+            }
         }
 
         // Necessary for Responsive images
@@ -54,7 +73,6 @@
                 .addClass('hide')
                 .removeClass('show');
 
-
             $('.has-dropdown-menu').on('click', function () {
                 if( $(this).hasClass('has-dropdown-menu') ) {
                     if( $(this).next('.dropdown-menu').hasClass('show') ) {
diff --git a/app/templates/orbit_bootstrap/assets/javascripts/plugin/jquery.cycle2.video.min.js b/app/templates/orbit_bootstrap/assets/javascripts/plugin/jquery.cycle2.video.min.js
new file mode 100644
index 0000000..1c415dc
--- /dev/null
+++ b/app/templates/orbit_bootstrap/assets/javascripts/plugin/jquery.cycle2.video.min.js
@@ -0,0 +1,2 @@
+/* Plugin for Cycle2; Copyright (c) 2012 M. Alsup; v20141007 */
+!function(a){"use strict";function b(){try{this.playVideo()}catch(a){}}function c(){try{this.pauseVideo()}catch(a){}}var d='<div class=cycle-youtube><object width="640" height="360"><param name="movie" value="{{url}}"></param><param name="allowFullScreen" value="{{allowFullScreen}}"></param><param name="allowscriptaccess" value="always"></param><param name="wmode" value="opaque"></param><embed src="{{url}}" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="{{allowFullScreen}}" wmode="opaque"></embed></object></div>';a.extend(a.fn.cycle.defaults,{youtubeAllowFullScreen:!0,youtubeAutostart:!1,youtubeAutostop:!0}),a(document).on("cycle-bootstrap",function(e,f){f.youtube&&(f.hideNonActive=!1,f.container.find(f.slides).each(function(b){if(void 0!==a(this).attr("href")){var c,e=a(this),g=e.attr("href"),h=f.youtubeAllowFullScreen?"true":"false";g+=(/\?/.test(g)?"&":"?")+"enablejsapi=1",f.youtubeAutostart&&f.startingSlide===b&&(g+="&autoplay=1"),c=f.API.tmpl(d,{url:g,allowFullScreen:h}),e.replaceWith(c)}}),f.slides=f.slides.replace(/(\b>?a\b)/,"div.cycle-youtube"),f.youtubeAutostart&&f.container.on("cycle-initialized cycle-after",function(c,d){var e="cycle-initialized"==c.type?d.currSlide:d.nextSlide;a(d.slides[e]).find("object,embed").each(b)}),f.youtubeAutostop&&f.container.on("cycle-before",function(b,d){a(d.slides[d.currSlide]).find("object,embed").each(c)}))})}(jQuery);
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_genernal.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_genernal.scss
new file mode 100644
index 0000000..d111388
--- /dev/null
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_genernal.scss
@@ -0,0 +1,8 @@
+.admin-edit {
+    clear: both;
+}
+
+img {
+    max-width: 100%;
+    height: auto;
+}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss
index e69de29..b4660e4 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss
@@ -0,0 +1,8 @@
+.pagination {
+    li {
+        a {
+            font-size: 0.8125rem;
+            margin: 0 0.2em;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_unity.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_unity.scss
index e69de29..2ee41c6 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_unity.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_unity.scss
@@ -0,0 +1,15 @@
+// Title
+.unity-title {
+  margin: 0.5em 0;
+  line-height: 1.5;
+  font-family: $main-font;
+  .layout-footer & {
+    margin-bottom: 10px;
+    border-bottom: none;
+    span {
+      display: inline;
+      margin-bottom: 0;
+      border-bottom: none;
+    }
+  }
+}
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss
index ee2c581..82e7939 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/base/_variables.scss
@@ -6,17 +6,15 @@ $theme-gray-light: #cecece;
 $theme-gray-lighter: #f3f3f3;
 $theme-gray-dark: #363636;
 $theme-gray-darker: #242424;
-
 $theme-white: #fff;
+$theme-red: #d20001;
+$theme-blue: #003d7e;
 
 $theme-color-main: #47bab5;
 $theme-color-second: #5bc0de;
 $theme-color-third: #ed4c43;
 
 
-$theme-red: #d20001;
-$theme-blue: #003d7e;
-
 // Font stacks
 $main-font: Arial, "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
 $sub-font: Arial, "新細明體", "Helvetica Neue", Helvetica, sans-serif;
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/footer.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/footer.scss
index 86a6a1c..193f7d4 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/footer.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/footer.scss
@@ -1,6 +1,7 @@
 .layout-footer {
   padding: 2em 0;
   color: #999999;
+  font-size: 0.8125em;
   background-color: $theme-gray-dark;
   .container {
     @extend .response-content;
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss
index ae716c3..7c70d3a 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss
@@ -9,7 +9,6 @@
     @extend .response-content;
   }
   .header-nav {
-    text-align: center;
     padding-top: 0.5rem;
     color: #FFF;
     & > * {
@@ -41,13 +40,15 @@
       padding-bottom: 0;
       line-height: 34px;
       color: #FFF;
-      font-size: 1.5em;
+      font-size: 1em;
+      font-family: $main-font;
+
       @media (min-width: $screen-sm) {
         height: 60px;
         margin: 0.5rem 0 0;
         padding-left: 0;
         line-height: 60px;
-        font-size: 2em;
+        font-size: 1.5em;
       }
       .site-logo {
         width: auto;
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss
index 70cd606..fdb0a60 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/ad_banner.scss
@@ -30,21 +30,17 @@
   .w-ad-banner__caption {
     background: $theme-color-main;
     color: $theme-white;
-    position: absolute;
-    left: 2em;
-    top: 5em;
-    width: 300px;
     z-index: 200;
-    padding: 1.5em 2em;
-    
+    padding: 0.5em 1em;
+
     h2 {
       font-family: $main-font;
       font-size: $w-caption-font-size;
+      margin: 0.5em 0;
     }
 
     p {
       font-family: $main-font;
-      line-height: 1.6;
       font-size: $w-caption-desc;
     }
 
@@ -53,7 +49,7 @@
     @include list-reset();
     position: absolute;
     right: 1em;
-    bottom: 1em;
+    top: 1em;
     z-index: 100;
 
     li {
@@ -88,6 +84,16 @@
     width: 100%;
     height: auto;
   }
+  .youtube {
+  }
+  .youtube, .cycle-youtube {
+    width: 100%;
+    height: 100%;
+  }
+  object, embed{
+      width: 100%;
+      height: 100%;
+  }
   .w-ad-banner__pager {
     @include list-reset();
     position: absolute;
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss
index 7a6233e..36e6d9f 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/announcement.scss
@@ -1,341 +1,461 @@
 @charset "utf-8";
 
-// Font sizes
-$w-title-font-size-large: 1.5rem;
-$w-title-font-size-small: 0.75rem;
-$w-subtitle-font-size: 0.75rem;
-$w-meta-font-size: 0.75rem;
+// 
+// Widget
+// 
 
-$w-table-th-font-size: 0.75em;
-$w-table-td-font-size: 0.75em;
-
-$i-title-font-size-large: 2em;
-
-// colors
-$white: white;
-$red: #d20001;
-$blue: #003d7e;
-$gray: #414141;
-
-$link-color: #366aa6;
-$link-hover-color: #608ec3;
-
-$table-th-bgcolor: $theme-color-main;
-
-//  ******************  Widget  ******************
-// Announcement widget 1
-.w-announcement {
-    a {
-        text-decoration: none;
+// Announcement widget
+// ## Gerneral styles for widgets
+.w-annc {
+    .w-annc__widget-title {
+        @extend .unity-title;
     }
-    .w-announcement__widget-title {
-        font-family: $main-font;
-        font-size: $w-title-font-size-large;
-        color: $gray;
-        margin: 0.5rem 0;
-    }
-    .w-announcement__list {
-        @include list-reset;
-    }
-    .w-announcement__item {
-        margin-bottom: 1em;
-        padding-bottom: 1em;
-        border-bottom: 1px dashed lighten($gray, 65%);
-    }
-    .w-announcement__pic-wrap {
-        padding-bottom: 33.3%;
-        margin-bottom: 1em;
-    }
-    .w-announcement__status-wrap {
-        display: inline-block;
-    }
-    .w-announcement__status {
-        font-size: $w-meta-font-size;
-        color: $white;
-        display: inline-block;
-        border-radius: 2px;
-        padding: 6px 10px;
-    }
-    .w-announcement__status.status-top {
-        background-color: $blue;
-    }
-    .w-announcement__status.status-hot {
-        background-color: $red;
-    }
-    .w-announcement__postdate {
-        font-size: $w-meta-font-size;
-        color: $gray;
-    }
-    .w-announcement__title {
-        font-family: $main-font;
-        margin: 15px 0 8px 0;
-        line-height: 1.4;
-    }
-    .w-announcement__link {
-        font-family: $main-font;
-        color: $link-color;
-    }
-    .w-announcement__link:hover {
-        color: $link-hover-color;
-    }
-    .w-announcement__subtitle {
-        font-family: $sub-font;
-        font-size: $w-subtitle-font-size;
-        line-height: 1.6;
-    }
-    .w-announcement__more {
-        color: $link-color;
-        font-size: 0.875rem;
-    }
-    .w-announcement__more:hover {
-        color: $link-hover-color;
-    }
-}
-
-// Announcement widget 2
-.annc-widget-2 {}
-
-// Announcement widget 3
-.annc-widget-3 {}
-
-// Announcement widget 4
-.annc-widget-4 {
-    .w-announcement__postdate {
-        display: inline-block;
-        margin-right: 0.5rem;
-    }
-    .w-announcement__title {
-        font-size: $w-title-font-size-small;
-        display: inline-block;
+    .w-annc__list {
         margin: 0;
+        padding: 0;
+        list-style: none;
     }
-    .w-announcement__item {
-        margin-bottom: 0.5rem;
-        padding-bottom: 0.5rem;
+    .w-annc__item {
+        margin-bottom: 30px;
     }
-}
-
-// Announcement widget 5
-.annc-widget-5 {
-    .w-announcement__item {
-        @include clearfix;
+    .label {
+        font-size: 0.75rem;
+        font-weight: normal;
     }
-    .w-announcement__pic-wrap {
-        float: left;
-        width: 32%;
-        margin-right: 3%;
-    }
-    .w-announcement__content-wrap {
-        float: left;
-        width: 65%;
-    }
-}
-
-// Announcement widget 6
-.annc-widget-6 {
-    .w-announcement__title {
-        font-size: $w-title-font-size-small;
-        display: inline-block;
-        margin: 0;
-    }
-    .w-announcement__postdate {
-        display: inline-block;
-        margin-right: 0.5rem;
-    }
-    .w-announcement__item {
-        margin-bottom: 0.5rem;
-        padding-bottom: 0.5rem;
-    }
-}
-
-// Announcement widget 7
-.annc-widget-7 {
-    .w-announcement__postdate {
-        margin-bottom: 0.5rem;
-    }
-    .w-announcement__title {
-        font-size: $w-title-font-size-small;
-        margin: 0;
-    }
-}
-
-// Announcement widget 8 -- table
-.w-announcement--table {
-    .w-announcement__table {
-        width: 100%;
-    }
-    .w-announcement__th {
-        font-size: $w-table-th-font-size;
-        color: $white;
-        background: $table-th-bgcolor;
-        white-space: nowrap;
-        padding: 0.5rem 0.8rem;
-    }
-    td {
-        font-size: $w-table-td-font-size;
-        border-bottom: 1px solid lighten($gray, 70%);
-        padding: 0.5rem;
-    }
-    .w-announcement__status {
-        margin-bottom: 0.3rem;
-    }
-}
-
-// Announcement widget 9 -- table
-
-.annc-widget-9 {}
-
-// Announcement widget 10 -- table
-
-.annc-widget-10 {}
-
-// Announcement widget 11 -- table
-.annc-widget-11 {}
-
-// Announcement widget 12 -- table
-.annc-widget-12 {}
-
-// Announcement widget 12 -- table
-.annc-widget-13 {}
-
-//  ******************  index  ******************
-
-// Announcement index 1 -- table
-.i-announcement--table {
-    .i-announcement__table {
-        width: 100%;
-    }
-    .i-announcement__th {
-        font-size: $w-table-th-font-size;
-        color: $white;
-        background: $table-th-bgcolor;
-        white-space: nowrap;
-        padding: 0.5rem 0.8rem;
-    }
-    td {
-        font-size: $w-table-td-font-size;
-        border-bottom: 1px solid lighten($gray, 70%);
-        padding: 0.5rem;
-    }
-    .i-announcement__status {
-        margin-bottom: 0.3rem;
-    }
-}
-
-// Announcement index 2 
-.i-announcement {
-    .i-announcement__title {
-        font-size: $i-title-font-size-large;
-        font-family: $main-font;
-    }
-    .i-announcement__list {
-        @include list-reset;
-    }
-    .i-announcement__pic-wrap {
-        margin-bottom: 1em;
-    }
-    .i-announcement__pic {
-    }
-    .i-announcement__status {
-        font-size: $w-meta-font-size;
-        color: $white;
-        display: inline-block;
-        border-radius: 2px;
-        padding: 6px 10px;
-    }
-    .i-announcement__status.status-top {
-        background-color: $blue;
-    }
-    .i-announcement__status.status-hot {
-        background-color: $red;
-    }
-}
-// Announcement SHOW
-.show-announcement {
-  .show-title {
-    @extend .unity-title;
-  }
-  .post-metadata {
-    border-bottom: 1px solid $theme-gray-light;
-    @include clearfix();
-    li {
-      margin-right: 1em;
-      margin-bottom: 0.6em;
-      float: left;
-      &.metadata-tags {
-        position: relative;
-        margin-right: 0;
-        padding-left: 1.6em;
-        clear: both;
-        float: none;
+    .w-annc__meta {
+        .w-annc__status-wrap,
+        .w-annc__postdate-wrap,
+        .w-annc__category-wrap {
+            display: inline-block;
+            margin-right: 0.2em;
+            font-size: 0.8125em;
+            color: $theme-gray;
+            font-weight: normal;
+        }
         i {
-          position: absolute;
-          top: 7px;
-          left: 0;
+            color: $theme-gray;
         }
-      }
-      &.metadata-tags {
-        .tag {
-          display: inline-block;
-          margin-bottom: 4px;
-          padding: 5px 8px;
-          font-size: 0.8em;
-          color: $theme-gray;
-          border: 1px solid $theme-gray-light;
-          text-decoration: none;
-          &:hover {
-            color: $theme-color-main;
-            border-color: $theme-color-main;
-            background-color: $theme-gray-lighter;
-          }
-        }
-      }
-      i {
-        color: darken($theme-gray-light, 10%);
-      }
     }
-  }
-  .post-section {
-    @include clearfix();
-    margin-bottom: 2em;
-    .post-pic {
-      img {
-        @include size(100%, auto);
-      }
+    .status-top {
+        background: $theme-color-second;
     }
-  }
-  .post-related {
-    padding-top: 1em;
-    border-top: 1px solid $theme-gray-light;
-    li {
-      padding-bottom: 3px;
-      padding-left: 1.6em;
-      & + li {
-        padding-top: 8px;
-        border-top: 1px dotted $theme-gray-light;
-      }
-      i {
-        margin: 8px 0 0 -1.6em;
-        float: left;
-        color: darken($theme-gray-light, 10%);
-      }
-      & > div {
-        display: inline-block;
-      }
-      a {
-        display: inline-block;
-        margin-bottom: 4px;
-        padding: 5px 8px;
-        font-size: 0.8em;
+    .status-hot {
+        background: $theme-color-third;
+    }
+    .w-annc__subtitle {
+        font-size: 0.8125em;
         color: $theme-gray;
-        border: 1px solid $theme-gray-light;
-        text-decoration: none;
-        &:hover {
-          color: $theme-color-main;
-          border-color: $theme-color-main;
-          background-color: $theme-gray-lighter;
-        }
-      }
     }
-  }
+    .w-annc__entry-title {
+        margin-bottom: 10px;
+    }
+    .w-annc__title {
+        font-family: $sub-font;
+        color: $theme-color-main;
+        text-decoration: none;
+        font-size: 0.8125rem;
+        &:hover {
+            color: darken($theme-color-main, 10%);
+        }
+    }
+}
+
+// Widget-1
+.w-announcement-1 {
+    .w-annc__img-wrap {
+        height: 200px;
+        margin: 0 0 1em 0;
+    }
+    .w-annc__title {
+        font-family: $main-font;
+        line-height: 1.3;
+        font-size: 1.2rem;
+    }
+}
+
+// Widget-2
+.w-announcement-2 {
+    .w-annc__img-wrap {
+        height: 200px;
+        margin: 0 0 1em 0;
+    }
+    .w-annc__title {
+        font-family: $main-font;
+        line-height: 1.3;
+        font-size: 1.2rem;
+    }
+}
+
+// Widget-3
+.w-announcement-3 {
+    .w-annc__img-wrap {
+        height: 200px;
+        margin: 0 0 1em 0;
+    }
+    .w-annc__title {
+        font-family: $main-font;
+        line-height: 1.3;
+        font-size: 1.2rem;
+    }
+}
+
+// Widget-4
+.w-announcement-4 {
+    .w-annc__title {
+        font-family: $main-font;
+        line-height: 1.3;
+        font-size: 1.2rem;
+    }
+    .w-annc__list > .w-annc__item:nth-child(3n+1) {
+        clear: both;
+    }
+    .w-annc__img-wrap {
+        height: 200px;
+        margin: 0 0 1em 0;
+    }
+}
+
+// Widget-5
+.w-announcement-5 {
+    .w-annc__title {
+        font-family: $main-font;
+        line-height: 1.3;
+        font-size: 1.2rem;
+    }
+    .w-annc__item {
+        border-bottom: 1px dashed lighten($theme-gray, 65%);
+        padding-bottom: 1em;
+        margin-bottom: 1em;
+    }
+}
+
+// Widget-6
+.w-announcement-6 {
+    .w-annc__item {
+        margin-bottom: 0.8em;
+        padding-bottom: 0.8em;
+        border-bottom: 1px dashed lighten($theme-gray, 65%);
+    }
+    .w-annc__entry-title {
+        margin: 0;
+    }
+    .w-annc__category-wrap,
+    .w-annc__status,
+    .w-annc__title,
+    .w-annc__postdate-wrap {
+        font-size: 0.8125rem;
+    }
+    .w-annc__status {
+        display: inline-block;
+    }
+}
+
+// Widget-7
+.w-announcement-7 {
+    .w-annc__item {
+        margin-bottom: 0.8em;
+        padding-bottom: 0.8em;
+        border-bottom: 1px dashed lighten($theme-gray, 65%);
+    }
+    .w-annc__entry-title {
+        margin: 0;
+    }
+    .w-annc__category-wrap,
+    .w-annc__status,
+    .w-annc__title,
+    .w-annc__postdate-wrap {
+        font-size: 0.75rem;
+    }
+    .w-annc__status {
+        display: inline-block;
+    }
+}
+
+// Widget-8 
+// ## Table
+.w-announcement-8 {
+    .w-annc__th {
+        color: #fff;
+        background: $theme-color-main;
+        font-size: 0.8125em;
+        border: none;
+    }
+    .w-annc__status {
+        display: inline-block;
+        font-size: 0.75rem;
+    }
+    td {
+        font-size: 0.8125em;
+    }
+    a:hover {
+        text-decoration: none;
+    }
+}
+
+// Widget-9
+// ## Table
+.w-announcement-9 {
+    .w-annc__th {
+        color: #fff;
+        background: $theme-color-main;
+        font-size: 0.8125em;
+        border: none;
+    }
+    .w-annc__status {
+        display: inline-block;
+        font-size: 0.75rem;
+    }
+    td {
+        font-size: 0.8125em;
+    }
+    a:hover {
+        text-decoration: none;
+    }
+}
+
+// Widget-10
+.w-announcement-10 {
+    .w-annc__item {
+        margin-bottom: 0.8em;
+        padding-bottom: 0.8em;
+        border-bottom: 1px dashed lighten($theme-gray, 65%);
+    }
+    .w-annc__entry-title {
+        margin: 0;
+    }
+    .w-annc__postdate-wrap {
+        font-size: 0.8125em;
+    }
+    .w-annc__status {
+        display: inline-block;
+        font-size: 0.75rem;
+    }
+}
+
+// Widget-11
+// ## Table
+.w-announcement-11 {
+    .w-annc__th {
+        color: #fff;
+        background: $theme-color-main;
+        font-size: 0.8125em;
+        border: none;
+    }
+    .w-annc__status {
+        display: inline-block;
+        font-size: 0.75rem;
+    }
+    td {
+        font-size: 0.8125em;
+    }
+    a:hover {
+        text-decoration: none;
+    }
+}
+
+// Widget-12
+.w-announcement-12 {
+    .w-annc__list {
+        padding: 0 15px;
+    }
+    .w-annc__img-wrap {
+        height: 300px;
+        margin-bottom: 15px;
+        @media (min-width: $screen-md) {
+            height: 200px;
+            margin-bottom: 0;
+        }
+    }
+    .w-annc__item {
+        margin-bottom: 0.8em;
+        padding-bottom: 0.8em;
+        border-bottom: 1px dashed lighten($theme-gray, 65%);
+    }
+    .w-annc__entry-title {
+        margin: 0 0 10px 0;
+        @media (min-width: $screen-md) {
+            margin-bottom: 0;
+        }
+    }
+    .w-annc__postdate-wrap {
+        font-size: 0.8125em;
+    }
+    .w-annc__status {
+        display: inline-block;
+    }
+    .w-annc__postdate {
+        font-size: 0.8125rem;
+    }
+}
+
+// Announcement index
+// ## General style for index pages
+.i-annc {
+    .i-annc__page-title {
+        @extend .unity-title;
+    }
+    .i-annc__list {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+    }
+    .status-top {
+        background: $theme-color-second;
+    }
+    .status-hot {
+        background: $theme-color-third;
+    }
+    .w-annc__widget-title {
+        @extend .unity-title;
+    }
+    .i-annc__item {
+        margin-bottom: 30px;
+    }
+    .label {
+        font-size: 0.75rem;
+        font-weight: normal;
+    }
+    .i-annc__meta {
+        .i-annc__status-wrap,
+        .i-annc__postdate-wrap,
+        .i-annc__category-wrap {
+            display: inline-block;
+            margin-right: 0.2em;
+            font-size: 0.8125em;
+            color: $theme-gray;
+            font-weight: normal;
+        }
+        i {
+            color: $theme-gray;
+        }
+    }
+    .i-annc__subtitle {
+        font-size: 0.8125em;
+        color: $theme-gray;
+    }
+    .i-annc__entry-title {
+        margin-bottom: 10px;
+    }
+    .i-annc__title {
+        font-family: $sub-font;
+        color: $theme-color-main;
+        text-decoration: none;
+        font-size: 0.8125rem;
+        &:hover {
+            color: darken($theme-color-main, 10%);
+        }
+    }
+}
+
+// Index-1
+.i-announcement-1 {
+    .i-annc__th {
+        color: #fff;
+        background: $theme-color-main;
+        font-size: 0.8125em;
+        border: none;
+    }
+    td {
+        font-size: 0.8125rem;
+    }
+    .i-annc__title:hover {
+        text-decoration: none;
+    }
+}
+
+// Index-2
+.i-announcement-2 {
+    .i-annc__img-wrap {
+        height: 200px;
+        margin: 0 0 1em 0;
+    }
+    .i-annc__title {
+        font-family: $main-font;
+        line-height: 1.3;
+        font-size: 1.2rem;
+    }
+}
+
+// Announcement show
+.s-annc {
+    .s-annc__show-title {
+        @extend .unity-title;
+    }
+    .s-annc__meta-wrap {
+        border-bottom: 1px solid $theme-gray-light;
+        @include clearfix;
+        .s-annc__meta--item {
+            font-size: 0.875rem;
+            margin-right: 1em;
+            margin-bottom: 0.6em;
+            float: left;
+            i {
+                color: darken($theme-gray-light, 10%);
+            }
+        }
+        .s-annc__tag-wrap {
+            position: relative;
+            margin-right: 0;
+            padding-left: 1.6em;
+            clear: both;
+            float: none;
+            i {
+                position: absolute;
+                top: 7px;
+                left: 0;
+            }
+        }
+        .s-annc__tag-wrap {
+            .s-annc__tag {
+                display: inline-block;
+                margin-bottom: 4px;
+                padding: 5px 8px;
+                font-size: 0.8em;
+                color: $theme-gray;
+                border: 1px solid $theme-gray-light;
+                text-decoration: none;
+                &:hover {
+                    color: $theme-color-main;
+                    border-color: $theme-color-main;
+                    background-color: $theme-gray-lighter;
+                }
+            }
+        }
+    }
+    .s-annc__post-wrap {
+        @include clearfix;
+        margin-bottom: 2em;
+    }
+    .s-annc__related-wrap {
+        padding-top: 1em;
+        border-top: 1px dotted $theme-gray-light;
+    }
+    .s-annc__related-file,
+    .s-annc__related-link {
+        padding-bottom: 6px;
+        padding-left: 1.6em;
+        i {
+            margin: 8px 0 0 -1.6em;
+            float: left;
+            color: darken($theme-gray-light, 10%);
+        }
+        a {
+            display: inline-block;
+            margin-bottom: 4px;
+            padding: 5px 8px;
+            font-size: 0.8em;
+            color: $theme-gray;
+            border: 1px solid $theme-gray-light;
+            text-decoration: none;
+            &:hover {
+                color: $theme-color-main;
+                border-color: $theme-color-main;
+                background-color: $theme-gray-lighter;
+            }
+        }
+    }
+    .s-annc__related-link-list,
+    .s-annc__related-file-list {
+        display: inline-block;
+    }
 }
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/archives.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/archives.scss
index bf1fbee..f4604d4 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/archives.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/archives.scss
@@ -2,7 +2,7 @@
 
 // 
 // Widget
-// -------------------------------------------------
+// 
 
 // Widget 
 // ## gerenral styles
@@ -76,7 +76,6 @@
   }
 }
 
-//  ******************  Index  ******************
 // Archive index 1
 .i-archive {
     font-family:  $main-font;
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss
index acc8436..c826274 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss
@@ -13,37 +13,6 @@
   .show-title {
     @extend .unity-title;
   }
-  // .show-content {
-  //   padding-right: 0;
-  //   padding-left: 0;
-  //   .img {
-  //     display: inline-block;
-  //     width: 100%;
-  //     height: auto;
-  //     opacity: (0.8);
-  //     -webkit-filter: grayscale(100%) brightness(1.2);
-  //     -moz-filter: grayscale(100%) brightness(1.2);
-  //     filter: grayscale(100%) brightness(1.2);
-  //     @include transition(all 0.2s ease);
-  //   }
-  //   .show-content-inner {
-  //     position: relative;
-  //     padding: 2px;
-  //     z-index: 0;
-  //     @include scale(1);
-  //     @include transition(all 0.2s ease);
-  //     &:hover {
-  //       z-index: 1;
-  //       @include scale(1.1);
-  //       .img {
-  //         opacity: (1);
-  //         -webkit-filter: grayscale(0%) brightness(1);
-  //         -moz-filter: grayscale(0%) brightness(1);
-  //         filter: grayscale(0%) brightness(1);
-  //       }
-  //     }
-  //   }
-  // }
   .post-metadata {
     border-bottom: 1px solid $theme-gray-light;
     @include clearfix();
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/menu.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/menu.scss
index c5c977f..ecac8c3 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/menu.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/modules/menu.scss
@@ -1,4 +1,5 @@
 .modules-menu {
+  font-family: $main-font;
   max-height: none;
   li {
     white-space: nowrap;
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss
index cd6646b..320c950 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss
@@ -5,7 +5,9 @@
 @import "base/mixins";
 @import "base/variables";
 @import "base/unity";
+@import "base/pagination";
 @import "base/orbitbar-override";
+@import "base/genernal";
 
 // Layout
 @import "layout/header";
@@ -32,7 +34,6 @@ html {
     font-size: 100%;
 }
 body {
-  font-family: 'Droid Sans';
-  margin-top: 40px;
+  margin-top: 40px; // needed for Orbit bar
   font-size: inherit;
 }
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss b/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss
index dc5577d..02b965d 100644
--- a/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss
+++ b/app/templates/orbit_bootstrap/assets/stylesheets/template/widget/sitemenu.scss
@@ -1,81 +1,86 @@
 .submenu-wrap {
-    padding: 20px 1em;
-}
+    @include clearfix();
+    padding: 10px 0;
 
-.submenu__title {
-    display: none;
-}
-
-.submenu__list {
-    @include clearfix;
-    list-style: none;
-    padding: 0;
-    margin: 0;
-}
-
-.submenu__item.level-1 {
-    position: relative;
-    float: left;
-    margin-right: 1%;
-    margin-bottom: 12px;
-}
-
-.submenu__link.level-1 {
-    float: left;
-    padding-bottom: 8px;
-    font-size: 13px;
-    font-size: 0.8125rem;
-    background: #0062a7;
-    color: #fff;
-    padding: 8px 0.8em;
-    border-radius: 0.2em;
-
-    &:hover {
-        background: #0f7fcc;
-    }
-}
-
-.submenu__item:hover .dropdown {
-    display: block;
-}
-
-// Submenu dropdown
-.submenu__list.dropdown {
-    display: none;
-    padding: 20px 0 0 0;
-    position: absolute;
-    left: 0;
-    top: 80%;
-    border-radius: 2px;
-    z-index: 200;
-}
-
-.submenu__list .dropdown:before {
-    content: "";
-    border-style: solid;
-    border-width: 0px 7px 7px 7px;
-    border-color: transparent transparent #83cccb transparent;
-    position: absolute;
-    top: 15px;
-    left: 15px;
-}
-
-.submenu__item.level-2 {
-    display: block;
-    padding: 4px 8px;
-    background: #83cccb;
-    font-size: 0.8125rem;
-}
-
-.submenu__link.level-2 {
-    color: #fff;
-    white-space: nowrap;
-}
-
-.submenu__list.hidden--item {
-    display: none;
-
-    &:before {
+    .submenu__title {
         display: none;
     }
-}
\ No newline at end of file
+
+    .submenu__list {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+    }
+
+    .submenu__item.level-1 {
+        position: relative;
+        float: left;
+        margin-right: 1%;
+        margin-bottom: 12px;
+    }
+
+    .submenu__link.level-1 {
+        float: left;
+        padding-bottom: 8px;
+        font-size: 13px;
+        font-size: 0.8125rem;
+        background: $theme-color-second;
+        color: #fff;
+        padding: 8px 0.8em;
+        border-radius: 0.2em;
+
+        &:hover {
+            background: darken($theme-color-second, 10%);
+        }
+    }
+
+    .submenu__item:hover .dropdown {
+        display: block;
+    }
+
+    .touch .submenu__item .dropdown {
+        display: none !important;
+    }
+
+    // Submenu dropdown
+    .submenu__list.dropdown {
+        display: none;
+        padding: 20px 0 0 0;
+        position: absolute;
+        left: 0;
+        top: 80%;
+        border-radius: 2px;
+        z-index: 200;
+    }
+
+
+    .submenu__list .dropdown:before {
+        content: "";
+        border-style: solid;
+        border-width: 0px 7px 7px 7px;
+        border-color: transparent transparent $theme-color-main transparent;
+        position: absolute;
+        top: 15px;
+        left: 15px;
+    }
+
+    .submenu__item.level-2 {
+        display: block;
+        padding: 4px 8px;
+        background: $theme-color-main;
+        font-size: 0.8125rem;
+    }
+
+    .submenu__link.level-2 {
+        color: #fff;
+        white-space: nowrap;
+    }
+
+    .submenu__list.hidden--item {
+        display: none;
+
+        &:before {
+            display: none;
+        }
+    }
+}
diff --git a/app/templates/orbit_bootstrap/home/footer.html.erb b/app/templates/orbit_bootstrap/home/footer.html.erb
index 1a5bd40..76aa7cc 100644
--- a/app/templates/orbit_bootstrap/home/footer.html.erb
+++ b/app/templates/orbit_bootstrap/home/footer.html.erb
@@ -1,9 +1,5 @@
 <footer class="layout-footer">
   <div class="container layout-footer-inner">
-    <div class="row">
-      <div class="layout-footer-content col-sm-4">{{footer-data}}</div>
-      <div class="layout-footer-content col-sm-4" data-pp="25"></div>
-      <div class="layout-footer-content col-sm-4" data-pp="26"></div>
-    </div>
+      <div class="layout-footer-content">{{footer-data}}</div>
   </div>
 </footer>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb
index 2effac6..f1c354c 100644
--- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -1,8 +1,4 @@
-<!-- 
-    AD banner widget-1 
-    Fields: image, caption, navigation
- -->
-<div class="w-ad-banner ad-banner-widget-1" >
+<div class="w-ad-banner ad-banner-widget-1 container">
   <div class="w-ad-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb
index eca8e6e..bd835e9 100644
--- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb
@@ -1,8 +1,4 @@
-<!-- 
-    Ad banner widget-2
-    Fields: image, navigation
- -->
-<div class="w-ad-banner ad-banner-widget-2" >
+<div class="w-ad-banner ad-banner-widget-2 container">
   <div class="w-ad-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
@@ -12,6 +8,8 @@
       data-pager=".w-ad-banner__pager"
       data-pager-template="<li><a href='#'></a></li>"
       data-pager-active-class="active-slide"
+      data-cycle-youtube=true
+      data-cycle-youtube-autostart=false
     >
     <div class="w-ad-banner__slide {{class}}"
         data-link="{{link}}"
@@ -21,6 +19,11 @@
       >
         <img class="w-ad-banner__image" src="{{image_link}}">
     </div>
+    <div class="w-ad-banner__slide  youtube {{class}}"
+        data-link=""
+    >
+      <a class="w-ad-banner__slide" href="https://www.youtube.com/v/f7AU2Ozu8eo?version=3&hl=en_US&rel=0&enablejsapi=1">Paul Irish</a>
+    </div>
   </div>
     <ul class="w-ad-banner__pager"></ul>
 </div>
diff --git a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb
index 82d5ab7..b739ba0 100644
--- a/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb
+++ b/app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb
@@ -1,8 +1,4 @@
-<!-- 
-    Ad banner widget-3
-    Fields: image
- -->
-<div class="w-ad-banner ad-banner-widget-2" >
+<div class="w-ad-banner ad-banner-widget-2 container">
   <div class="w-ad-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb
index a7c2e7f..64a4416 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb
@@ -1,30 +1,29 @@
-<!-- 
-    Announcement widget-1 
-    Fields: widget-title, image, status, postdate, title, subtitle, readmore
- -->
-<div class="w-announcement  annc-widget-1">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__pic-wrap  bullseye">
-          <a class="w-announcement__link" href="{{link_to_show}}">
-            <img class="w-announcement__pic" src="{{img_src}}" alt="Announcement image">
-          </a>
-        </div>
-        <div class="w-announcement__content-wrap">
-          <div class="w-announcement__status-wrap" data-list="statuses" data-level="1">
-            <span class="w-announcement__status  label  status {{status-class}}">{{status}}</span>
-          </div>
-          <span class="w-announcement__postdate" date-format="%Y-%m-%d">
-              <i class="fa fa-calendar"></i> 
-              {{postdate}}
-          </span>
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-          <p class="w-announcement__subtitle">{{subtitle}}</p>
-          <a class="w-announcement__more" href="{{link_to_show}}">Read More »</a>
-        </div>
-      </li>
+<div class="w-annc  w-announcement-1">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item">
+      <div class="w-annc__img-wrap  bullseye">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
+      </div>
+      <div class="w-annc__meta">
+        <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+          <span class="w-annc__status label {{status-class}}">{{status}}</span>
+        </span>
+        <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <span class="w-annc__category-wrap">
+          <i class="fa fa-tasks"></i>
+          <span class="w-annc__category">{{category}}</span>
+        </span>
+      </div>
+      <h4 class="w-annc__entry-title">
+        <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+      </h4>
+      <p class="w-annc__subtitle">{{subtitle}}</p>
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb
index 145440f..4e0a944 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb
@@ -1,19 +1,19 @@
-<!-- 
-    Announcement widget-10
-    Fields: widget-title, title, postdate
- -->
-<div class="w-announcement  annc-widget-10  w-announcement--table">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <table class="w-announcement__table">
-    <thead>
-        <th class="w-announcement__th">{{title-head}}</th>
-        <th class="w-announcement__th">{{date-head}}</th>
-    </thead>
-    <tbody class="w-announcement__list" data-level="0" data-list="announcements">
-        <tr>
-          <td><a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a></td>
-          <td date-format="%Y-%m-%d">{{postdate}}</td>
-        </tr>
-    </tbody>
-  </table>
-</div>
\ No newline at end of file
+<div class="w-annc  w-announcement-10">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item  row">
+        <h4 class="w-annc__entry-title  col-sm-9">
+          <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="w-annc__status label {{status-class}}">{{status}}</span>
+          </span>
+          <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+        </h4>
+        <span class="w-annc__postdate-wrap  col-sm-3" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+    </li>
+  </ul>
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb
index da7be9f..24a6df5 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb
@@ -1,23 +1,23 @@
-<!-- 
-    Announcement widget-11
-    Fields: widget-title, category, title, postdate
- -->
-<div class="w-announcement  annc-widget-11  w-announcement--table">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <table class="w-announcement__table">
+<div class="w-annc  w-announcement-11">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <table class="w-annc__table  table">
     <thead>
       <tr>
-        <th class="w-announcement__th">{{category-head}}</th>
-        <th class="w-announcement__th">{{title-head}}</th>
-        <th class="w-announcement__th">{{date-head}}</th>
+        <th class="w-annc__th  w-annc__th--title">{{title-head}}</th>
+        <th class="w-annc__th  w-annc__th--date">{{date-head}}</th>
       </tr>
     </thead>
-    <tbody class="w-announcement__list" data-level="0" data-list="announcements">
+    <tbody data-level="0" data-list="announcements">
         <tr>
-          <td>{{category}}</td>
-          <td><a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a></td>
-          <td date-format="%Y-%m-%d">{{postdate}}</td>
+          <td>
+            <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+              <span class="w-annc__status  label  status {{status-class}}">{{status}}</span>
+            </span>
+            <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
           </td>
+          <td class="w-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</td>
         </tr>
     </tbody>
   </table>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb
index 0c963c5..6d8034e 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb
@@ -1,24 +1,27 @@
-<!-- 
-    Announcement widget-12
-    Fields: widget-title, category, postdate, title
- -->
-<div class="w-announcement  annc-widget-12  w-announcement--table">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <table class="w-announcement__table">
-    <thead>
-      <tr>
-        <th class="w-announcement__th">{{category-head}}</th>
-        <th class="w-announcement__th">{{date-head}}</th>
-        <th class="w-announcement__th">{{title-head}}</th>
-      </tr>
-    </thead>
-    <tbody class="w-announcement__list" data-level="0" data-list="announcements">
-        <tr>
-          <td>{{category}}</td>
-          <td date-format="%Y-%m-%d">{{postdate}}</td>
-          <td><a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a></td>
-          </td>
-        </tr>
-    </tbody>
-  </table>
-</div>
\ No newline at end of file
+<div class="w-annc  w-announcement-12">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <div class="w-annc__inner  row">
+    <div class="w-annc__img-wrap  col-md-4  bullseye">
+      <img class="w-annc__img" src="{{main_picture}}" alt="{{main_picture_description}}">
+    </div>
+    <ul class="w-annc__list  col-md-8" data-level="0" data-list="announcements">
+      <li class="w-annc__item">
+        <div class="w-annc__content  row">
+          <h4 class="w-annc__entry-title  col-md-9">
+            <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+              <span class="w-annc__status label {{status-class}}">{{status}}</span>
+            </span>
+            <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+          </h4>
+          <span class="w-annc__postdate-wrap  col-md-3" date-format="%Y-%m-%d">
+            <i class="fa fa-calendar-o"></i>
+            <span class="w-annc__postdate">{{postdate}}</span>
+          </span>
+        </div>
+      </li>
+    </ul>    
+  </div>
+
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb
deleted file mode 100644
index 829588d..0000000
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- 
-    Announcement widget-13
-    Fields: widget-title, title
- -->
-<div class="w-announcement  annc-widget-13">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__content-wrap">
-          <div class="w-announcement__status-wrap" data-list="statuses" data-level="1">
-            <span class="w-announcement__status  label  status {{status-class}}">{{status}}</span>
-          </div>
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-        </div>
-      </li>
-  </ul>
-</div>
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb
index a77fc1d..758fb11 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb
@@ -1,25 +1,31 @@
-<!-- 
-    Announcement widget-2 
-    Fields: widget-title, status, postdate, title, subtitle, readmore
- -->
-<div class="w-announcement  annc-widget-2">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__content-wrap">
-          <div class="w-announcement__status-wrap" data-list="statuses" data-level="1">
-            <span class="w-announcement__status  label  status {{status-class}}">{{status}}</span>
-          </div>
-          <span class="w-announcement__postdate" date-format="%Y-%m-%d">
-              <i class="fa fa-calendar"></i> 
-              {{postdate}}
+<div class="w-annc  w-announcement-2">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item  row">
+      <div class="w-annc__img-wrap  col-sm-4  bullseye">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
+      </div>
+      <div class="w-annc__content-wrap  col-sm-8">  
+        <div class="w-annc__meta">
+          <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="w-annc__status label {{status-class}}">{{status}}</span>
+          </span>
+          <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+            <i class="fa fa-calendar-o"></i>
+            <span class="w-annc__postdate">{{postdate}}</span>
+          </span>
+          <span class="w-annc__category-wrap">
+            <i class="fa fa-tasks"></i>
+            <span class="w-annc__category">{{category}}</span>
           </span>
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-          <p class="w-announcement__subtitle">{{subtitle}} </p>
-          <a class="w-announcement__more" href="{{link_to_show}}">Read More »</a>
         </div>
-      </li>
+        <h4 class="w-annc__entry-title">
+          <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+        </h4>
+        <p class="w-annc__subtitle">{{subtitle}}</p>
+      </div>
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb
index 9515901..9a9c603 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb
@@ -1,22 +1,31 @@
-<!-- 
-    Announcement widget-3
-    Fields: widget-title, postdate, title, subtitle, readmore
- -->
-<div class="w-announcement  annc-widget-3">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__content-wrap">
-          <span class="w-announcement__postdate" date-format="%Y-%m-%d">
-              <i class="fa fa-calendar"></i> 
-              {{postdate}}
+<div class="w-annc  w-announcement-3">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item  row">
+      <div class="w-annc__content-wrap  col-sm-8">  
+        <div class="w-annc__meta">
+          <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="w-annc__status label {{status-class}}">{{status}}</span>
+          </span>
+          <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+            <i class="fa fa-calendar-o"></i>
+            <span class="w-annc__postdate">{{postdate}}</span>
+          </span>
+          <span class="w-annc__category-wrap">
+            <i class="fa fa-tasks"></i>
+            <span class="w-annc__category">{{category}}</span>
           </span>
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-          <p class="w-announcement__subtitle">{{subtitle}} </p>
-          <a class="w-announcement__more" href="{{link_to_show}}">Read More »</a>
         </div>
-      </li>
+        <h4 class="w-annc__entry-title">
+          <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+        </h4>
+        <p class="w-annc__subtitle">{{subtitle}}</p>
+      </div>
+      <div class="w-annc__img-wrap  col-sm-4  bullseye">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
+      </div>      
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb
index 4479571..0a60eca 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb
@@ -1,19 +1,31 @@
-<!-- 
-    Announcement widget-4
-    Fields: widget-title, postdate, title
- -->
-<div class="w-announcement  annc-widget-4">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__content-wrap">
-          <span class="w-announcement__postdate" date-format="%Y-%m-%d">
-             {{postdate}}
+<div class="w-annc  w-announcement-4">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list  row" data-level="0" data-list="announcements">
+    <li class="w-annc__item  col-md-4">
+    <div class="w-annc__img-wrap  bullseye">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
+    </div>  
+    <div class="w-annc__content-wrap">  
+      <div class="w-annc__meta">
+        <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+          <span class="w-annc__status label {{status-class}}">{{status}}</span>
+        </span>
+        <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <span class="w-annc__category-wrap">
+          <i class="fa fa-tasks"></i>
+          <span class="w-annc__category">{{category}}</span>
           </span>
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-        </div>
-      </li>
+      </div>
+      <h4 class="w-annc__entry-title">
+        <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+      </h4>
+      <p class="w-annc__subtitle">{{subtitle}}</p>
+    </div>
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb
index 8437d15..6ff8203 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb
@@ -1,30 +1,28 @@
-<!-- 
-    Announcement widget-5
-    Fields: widget-title, img, status, postdate, title, subtitle, readmore
- -->
-<div class="w-announcement  annc-widget-5">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__pic-wrap  resizeimg">
-          <a class="w-announcement__link" href="{{link_to_show}}">
-             <img class="w-announcement__pic" src="{{img_src}}" alt="Announcement image">
-          </a>
-        </div>
-        <div class="w-announcement__content-wrap">
-          <div class="w-announcement__status-wrap" data-list="statuses" data-level="1">
-            <span class="w-announcement__status  label  status {{status-class}}">{{status}}</span>
-          </div>
-          <span class="w-announcement__postdate" date-format="%Y-%m-%d">
-              <i class="fa fa-calendar"></i> 
-              {{postdate}}
-          </span>
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-          <p class="w-announcement__subtitle">{{subtitle}} </p>
-          <a class="w-announcement__more" href="{{link_to_show}}">Read More »</a>
-        </div>
-      </li>
+<div class="w-annc  w-announcement-5">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list  row" data-level="0" data-list="announcements">
+    <li class="w-annc__item">
+    <div class="w-annc__content-wrap">  
+      <div class="w-annc__meta">
+        <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <span class="w-annc__category-wrap">
+          <i class="fa fa-tasks"></i>
+          <span class="w-annc__category">{{category}}</span>
+        </span>
+        <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+          <span class="w-annc__status label {{status-class}}">{{status}}</span>
+        </span>
+      </div>
+      <h4 class="w-annc__entry-title">
+        <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+      </h4>
+      <p class="w-annc__subtitle">{{subtitle}}</p>
+    </div>
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb
index 142140b..2cd9ec6 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb
@@ -1,20 +1,23 @@
-<!-- 
-    Announcement widget-6
-    Fields: widget-title, title, postdate
- -->
-<div class="w-announcement  annc-widget-6">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__content-wrap">
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-          <span class="w-announcement__postdate" date-format="%Y-%m-%d">
-              {{postdate}}
+<div class="w-annc  w-announcement-6">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item  row">
+        <span class="w-annc__category-wrap  col-sm-2">
+          <i class="fa fa-tasks"></i>
+          <span class="w-annc__category">{{category}}</span>
+        </span>
+        <h4 class="w-annc__entry-title  col-sm-8">
+          <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="w-annc__status label {{status-class}}">{{status}}</span>
           </span>
-
-        </div>
-      </li>
+          <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+        </h4>
+        <span class="w-annc__postdate-wrap  col-sm-2" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb
index 83e397b..7bb586f 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb
@@ -1,19 +1,23 @@
-<!-- 
-    Announcement widget-7
-    Fields: widget-title, postdate, title
- -->
-<div class="w-announcement  annc-widget-7">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <ul class="w-announcement__list" data-level="0" data-list="announcements">
-      <li class="w-announcement__item">
-        <div class="w-announcement__content-wrap">
-          <span class="w-announcement__postdate" date-format="%Y-%m-%d">
-              {{postdate}}
+<div class="w-annc  w-announcement-7">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item  row">
+        <span class="w-annc__postdate-wrap  col-sm-2" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <h4 class="w-annc__entry-title  col-sm-8">
+          <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="w-annc__status label {{status-class}}">{{status}}</span>
           </span>
-          <h4 class="w-announcement__title">
-            <a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a>
-          </h4>
-        </div>
-      </li>
+          <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+        </h4>         
+        <span class="w-annc__category-wrap  col-sm-2">
+          <i class="fa fa-tasks"></i>
+          <span class="w-annc__category">{{category}}</span>
+        </span>
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb
index 85cd5e3..1349098 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb
@@ -1,28 +1,25 @@
-<!-- 
-    Announcement widget-8
-    Fields: widget-title, postdate, title, status, category
- -->
-<div class="w-announcement  annc-widget-8  w-announcement--table">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <table class="w-announcement__table">
+<div class="w-annc  w-announcement-8">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <table class="w-annc__table  table">
     <thead>
       <tr>
-        <th class="w-announcement__th">{{date-head}}</th>
-        <th class="w-announcement__th">{{title-head}}</th>
-        <th class="w-announcement__th">{{status-head}}</th>
-        <th class="w-announcement__th">{{category-head}}</th>
+        <th class="w-annc__th  w-annc__th--category">{{category-head}}</th>
+        <th class="w-annc__th  w-annc__th--title">{{title-head}}</th>
+        <th class="w-annc__th  w-annc__th--date">{{date-head}}</th>
       </tr>
     </thead>
-    <tbody class="w-announcement__list" data-level="0" data-list="announcements">
+    <tbody data-level="0" data-list="announcements">
         <tr>
-          <td date-format="%Y-%m-%d">{{postdate}}</td>
-          <td><a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a></td>
+          <td class="w-annc__category">{{category}}</td>
           <td>
-            <div class="w-announcement__status-wrap" data-list="statuses" data-level="1">
-              <span class="w-announcement__status  label  status {{status-class}}">{{status}}</span>
-            </div>
+            <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+              <span class="w-annc__status  label  status {{status-class}}">{{status}}</span>
+            </span>
+            <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
           </td>
-          <td>{{category}}</td>
+          <td class="w-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</td>
         </tr>
     </tbody>
   </table>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb
index 10aaaed..6613b06 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb
@@ -1,28 +1,25 @@
-<!-- 
-    Announcement widget-9
-    Fields: widget-title, status, postdate, title, category
- -->
-<div class="w-announcement  annc-widget-9  w-announcement--table">
-  <h3 class="w-announcement__widget-title">{{widget-title}}</h3>
-  <table class="w-announcement__table">
+<div class="w-annc  w-announcement-9">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <table class="w-annc__table  table">
     <thead>
       <tr>
-        <th class="w-announcement__th">{{status-head}}</th>
-        <th class="w-announcement__th">{{date-head}}</th>
-        <th class="w-announcement__th">{{title-head}}</th>
-        <th class="w-announcement__th">{{category-head}}</th>
+        <th class="w-annc__th  w-annc__th--date">{{date-head}}</th>
+        <th class="w-annc__th  w-annc__th--title">{{title-head}}</th>
+        <th class="w-annc__th  w-annc__th--category">{{category-head}}</th>
       </tr>
     </thead>
-    <tbody class="w-announcement__list" data-level="0" data-list="announcements">
-        <tr>          
+    <tbody data-level="0" data-list="announcements">
+        <tr>
+          <td class="w-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</td>
           <td>
-            <div class="w-announcement__status-wrap" data-list="statuses" data-level="1">
-              <span class="w-announcement__status  label  status {{status-class}}">{{status}}</span>
-            </div>
+            <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+              <span class="w-annc__status  label  status {{status-class}}">{{status}}</span>
+            </span>
+            <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
           </td>
-          <td date-format="%Y-%m-%d">{{postdate}}</td>
-          <td><a class="w-announcement__link" href="{{link_to_show}}">{{title}}</a></td>
-          <td>{{category}}</td>
+          <td class="w-annc__category">{{category}}</td>
         </tr>
     </tbody>
   </table>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb
index e51a862..985527b 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb
@@ -1,20 +1,16 @@
-<!-- 
-    Announcement index-1 
-    Fields: widget-title, date-head, title-head, postdate, title, pagination
- -->
-<div class="i-announcement  annc-index-1  i-announcement--table">
-  <h3 class="i-announcement__widget-title">{{widget-title}}</h3>
-  <table class="i-announcement__table">
+<div class="i-annc  i-announcement-1">
+  <h3 class="i-annc__page-title">{{page-title}}</h3>
+  <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
-        <th class="i-announcement__th  i-announcement__th--date">{{date-head}}</th>
-        <th class="i-announcement__th  i-announcement__th--title">{{title-head}}</th>
+        <th class="i-annc__th  i-annc__th--date">{{date-head}}</th>
+        <th class="i-annc__th  i-annc__th--title">{{title-head}}</th>
       </tr>
     </thead>
-    <tbody class="i-announcement__tbody" data-level="0" data-list="announcements">
+    <tbody data-level="0" data-list="announcements">
       <tr>
-        <td><span class="i-announcement__date  i-announcement__td--postdate" date-format="%Y-%m-%d">{{postdate}}</span></td>
-        <td><a class="i-announcement__link  i-announcement__td--link" href="{{link_to_show}}">{{title}}</a></td>
+        <td><span class="i-annc__postdate" date-format="%Y-%m-%d">{{postdate}}</span></td>
+        <td><a class="i-annc__title" href="{{link_to_show}}">{{title}}</a></td>
       </tr>
     </tbody>
   </table>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb
index 5b5aa18..cdfc614 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb
@@ -1,24 +1,28 @@
-<!-- 
-    Announcement index-2
-    Fields: widget-title, date-head, title-head, postdate, title, pagination
- -->
-<div class="i-announcement  annc-index-2">
-  <h3 class="i-announcement__title">{{page-title}}</h3>
-  <ul class="i-announcement__list" data-level="0" data-list="announcements">
-    <li class="i-announcement__item">
-      <div class="i-announcement__pic-wrap  bullseye">
-            <img class="i-announcement__pic" src="{{img_src}}" alt="{{img_description}}">
+<div class="i-annc  i-announcement-2">
+  <h3 class="i-annc__page-title">{{page-title}}</h3>
+  <ul class="i-annc__list" data-level="0" data-list="announcements">
+    <li class="i-annc__item">
+      <div class="i-annc__img-wrap  bullseye">
+            <img class="i-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>
-      <div class="i-announcement__content-wrap">
-        <h4 class="i-announcement__title">
-          <a class="i-announcement__link" href="{{link_to_show}}">{{title}}</a>
+      <div class="i-annc__content-wrap">
+        <div class="i-annc__meta">
+          <span class="i-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="i-annc__status label status {{status-class}}">{{status}}</span>
+          </span>
+          <span class="i-annc__postdate-wrap" date-format="%Y-%m-%d">
+            <i class="fa fa-calendar-o"></i>
+            <span class="i-annc__postdate">{{postdate}}</span>
+          </span>
+          <span class="i-annc__category-wrap">
+            <i class="fa fa-tasks"></i>
+            <span class="i-annc__category">{{category}}</span>
+          </span>
+        </div>
+        <h4 class="i-annc__entry-title">
+          <a class="i-annc__title" href="{{link_to_show}}">{{title}}</a>
         </h4>
-        <span class="i-announcement__status-wrap" data-list="statuses" data-level="1">
-          <span class="i-announcement__status label status {{status-class}}">{{status}}</span>
-        </span>
-        <span class="i-announcement__date" date-format="%Y-%m-%d"><i class="fa fa-calendar"></i>{{postdate}}</span>
-        <p class="i-announcement__subtitle">{{subtitle}}</p>
-        <a class="i-announcement__more" href="{{link_to_show}}">Read More »</a>
+        <p class="i-annc__subtitle">{{subtitle}}</p>
       </div>
     </li> 
   </ul>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/info.json b/app/templates/orbit_bootstrap/modules/announcement/info.json
index 51b3d6c..34e990a 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/info.json
+++ b/app/templates/orbit_bootstrap/modules/announcement/info.json
@@ -3,124 +3,116 @@
 		{
 			"filename" : "annc_index1",
 			"name" : {
-				"zh_tw" : "1. 純文字無圖片 ( 模組標題, 日期, 標題 )",
-				"en" : "1. Text without image (widget-title, postdate, title)"
+				"zh_tw" : "1. 標準表格列表 ( 模組標題, 日期, 標題 )",
+				"en" : "1. Standard Table List (widget-title, postdate, title)"
 				},
-			"thumbnail" : "thumbnail-block-list.png"
+			"thumbnail" : "annc_index1_thumbs.png"
 		},
 		{
 			"filename" : "annc_index2",
 			"name" : {
-				"zh_tw" : "2. 完整圖文 ( 模組標題, 日期, 標題, 圖片, 閱讀更多, 標籤 )",
-				"en" : "2. Text with image (widget-title, postdate, title, image)"
+				"zh_tw" : "2. 標準圖片 ( 模組標題, 日期, 標題, 圖片, 閱讀更多, 標籤 )",
+				"en" : "2. Standard Image + Text (widget-title, postdate, title, image)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_index2_thumbs.png"
 		}
 	],
 	"widgets" : [
 		{
 			"filename" : "annc_widget1",
 			"name" : {
-				"zh_tw" : "1. 圖文 ( 模組標題, 圖片, 狀態, 日期, 標題, 副標題, 閱讀更多 )",
-				"en" : "1. Text with image (widget-title, image, status, postdate, title, subtitle, readmore)"
+				"zh_tw" : "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+				"en" : "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget1_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget2",
 			"name" : {
-				"zh_tw" : "2. 圖文 ( 模組標題, 狀態, 日期, 標題, 副標題, 閱讀更多 )",
-				"en" : "2. Text with image (widget-title, status, postdate, title, subtitle, readmore)"
+				"zh_tw" : "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+				"en" : "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
 			},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget2_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget3",
 			"name" : {
-				"zh_tw" : "3. 圖文 ( 模組標題, 日期, 標題, 副標題, 閱讀更多 )",
-				"en" : "3. Text with image (widget-title, postdate, title, subtitle, readmore)"
+				"zh_tw" : "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+				"en" : "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
 			},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget3_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget4",
 			"name" : {
-				"zh_tw" : "4. 列表 ( 模組標題, 日期, 標題 )",
-				"en" : "4. List (widget-title, postdate, title)"
+				"zh_tw" : "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+				"en" : "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
 			},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget4_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget5",
 			"name" : {
-				"zh_tw" : "5. 圖文 ( 模組標題, 圖片, 狀態, 日期, 標題, 副標題, 閱讀更多 )",
-				"en" : "5. List (widget-title, image, status, postdate, title, subtitle, readmore)"
+				"zh_tw" : "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
+				"en" : "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
 			},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget5_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget6",
 			"name" : {
-				"zh_tw" : "6. 列表 ( 模組標題, 日期, 標題 )",
-				"en" : "6. List (widget-title, postdate, title)"
+				"zh_tw" : "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+				"en" : "6. Standard Title List-1 (widget-title, category, status, title, postdate)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget6_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget7",
 			"name" : {
-				"zh_tw" : "7. 列表 ( 模組標題, 日期, 標題 )",
-				"en" : "7. List (widget-title, postdate, title)"
+				"zh_tw" : "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+				"en" : "7. Standard Title List-2 (widget-title, postdate, status, title, category)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget7_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget8",
 			"name" : {
-				"zh_tw" : "8. 表格列表 ( 模組標題, 日期, 標題, 狀態, 類別 )",
-				"en" : "8. Table (widget-title, postdate, title, status, category)"
+				"zh_tw" : "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+				"en" : "8. Standard Table List-1 (widget-title, category, status, title, postdate)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget8_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget9",
 			"name" : {
-				"zh_tw" : "9. 表格列表 ( 模組標題, 狀態, 日期, 標題, 類別 )",
-				"en" : "9. Table (widget-title, status, postdate, title, category)"
+				"zh_tw" : "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+				"en" : "9. Standard Table List-2 (widget-title, postdate, status, title, category)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget9_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget10",
 			"name" : {
-				"zh_tw" : "10. 表格列表 ( 模組標題, 標題, 日期 )",
-				"en" : "10. Table (widget-title, title, postdate)"
+				"zh_tw" : "10. 精簡標題列表 ( 模組標題, 狀態, 標題, 日期 )",
+				"en" : "10. Simple Title List-1 (widget-title, status, title, postdate)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget10_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget11",
 			"name" : {
-				"zh_tw" : "11. 表格列表 ( 模組標題, 標題, 日期 )",
-				"en" : "11. Table (widget-title, title, postdate)"
+				"zh_tw" : "11. 精簡表格列表 ( 模組標題, 狀態, 標題, 日期 )",
+				"en" : "11. Simple Table List (widget-title, status, title, postdate)"
 				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget11_thumbs.png"
 		},
 		{
 			"filename" : "annc_widget12",
 			"name" : {
-				"zh_tw" : "12. 表格列表 ( 模組標題, 日期, 標題 )",
-				"en" : "12. Table (widget-title, postdate, title)"
+				"zh_tw" : "12. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )",
+				"en" : "12. 1 Image + Title List (widget-title, status, title, postdate)"
 				},
-			"thumbnail" : "thumbnail-block.png"
-		},
-		{
-			"filename" : "annc_widget13",
-			"name" : {
-				"zh_tw" : "13. 列表( 模組標題, 標題 )",
-				"en" : "13. List (widget-title, title)"
-				},
-			"thumbnail" : "thumbnail-block.png"
+			"thumbnail" : "annc_widget12_thumbs.png"
 		}
 	]
 }
\ No newline at end of file
diff --git a/app/templates/orbit_bootstrap/modules/announcement/show.html.erb b/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
index 557cd33..4a024b5 100644
--- a/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
+++ b/app/templates/orbit_bootstrap/modules/announcement/show.html.erb
@@ -1,41 +1,44 @@
-<article class="show-announcement">
-  <h1 class="show-title">
-    <span>{{title}}</span>
-  </h1>
-  <ul class="post-metadata list-unstyled">
-    <li class="metadata-date">
-      <i class="fa fa-calendar fa-fw"></i>
-      <span class="date">{{updated_at}}</span>
+<article class="s-annc  s-announcement">
+  <h1 class="s-annc__show-title">{{title}}</h1>
+  
+  <ul class="s-annc__meta-wrap  list-unstyled">
+    <li class="s-annc__date-wrap  s-annc__meta--item">
+      <i class="fa fa-calendar-o"></i>
+      <span class="s-annc__date" date-format="%Y-%m-%d">{{updated_at}}</span>
     </li>
-    <li class="metadata-author">
-      <i class="fa fa-male fa-fw"></i>
-      <span class="author">{{update_user}}</span>
+    <li class="s-annc__author-wrap  s-annc__meta--item">
+      <i class="fa fa-male"></i>
+      <span class="s-annc__author">{{update_user}}</span>
     </li>
-    <li class="metadata-tags">
-      <i class="fa fa-tags fa-fw"></i>
+    <li class="s-annc__tag-wrap  s-annc__meta--item ">
+      <i class="fa fa-tags"></i>
       <span data-list="tags" data-level="0">
-        <a href="{{url}}"><span class="tag">{{tag}}</span></a>
+        <a href="{{url}}"><span class="s-annc__tag">{{tag}}</span></a>
       </span>
     </li>
   </ul>
-  <section class="post-section">
-    <p class="post-content">{{body}}</p>
+
+  <section class="s-annc__post-wrap">
+    <p class="s-annc__post-body">{{body}}</p>
   </section>
-  <ul class="post-related list-unstyled">
-    <li class="post-related-files">
+  
+  <ul class="s-annc__related-wrap  list-unstyled">
+    <li class="s-annc__related-file">
       <i class="fa fa-fw fa-paperclip"></i>
-      <div class="post-related-flises-list" data-list="bulletin_files" data-level="0">
-        <a href="{{file_url}}">{{file_title}}</a>
+      <div class="s-annc__related-file-list" data-list="bulletin_files" data-level="0">
+        <a class="s-annc__flie-title" href="{{file_url}}">{{file_title}}</a>
       </div>
     </li>
-    <li class="post-related-links">
+
+    <li class="s-annc__related-link">
       <i class="fa fa-fw fa-link"></i>
-      <div class="post-related-links-list" data-list="bulletin_links" data-level="0">
+      <div class="s-annc__related-link-list" data-list="bulletin_links" data-level="0">
         <a href="{{link_url}}" target="_blank">{{link_title}}</a>
       </div>
     </li>
   </ul>
-  <div class="social-buttons">
+
+  <div class="s-annc__social">
     <div class="fb-share-button" data-type="button"></div>
     <a href="https://twitter.com/share" class="twitter-share-button" data-dnt="true" data-count="none">Tweet</a>
   </div>
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index1_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index1_thumbs.png
new file mode 100644
index 0000000..626b824
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index1_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/thumbnail-block.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index2_thumbs.png
similarity index 100%
rename from app/templates/orbit_bootstrap/modules/announcement/thumbs/thumbnail-block.png
rename to app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_index2_thumbs.png
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget10_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget10_thumbs.png
new file mode 100644
index 0000000..8dc2261
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget10_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget11_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget11_thumbs.png
new file mode 100644
index 0000000..157f2d4
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget11_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget12_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget12_thumbs.png
new file mode 100644
index 0000000..0e6ba7b
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget12_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget1_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget1_thumbs.png
new file mode 100644
index 0000000..77ba0a8
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget1_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget2_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget2_thumbs.png
new file mode 100644
index 0000000..832fe35
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget2_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget3_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget3_thumbs.png
new file mode 100644
index 0000000..eac8619
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget3_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget4_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget4_thumbs.png
new file mode 100644
index 0000000..b69abd9
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget4_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget5_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget5_thumbs.png
new file mode 100644
index 0000000..cf6eb30
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget5_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget6_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget6_thumbs.png
new file mode 100644
index 0000000..9fc7c23
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget6_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget7_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget7_thumbs.png
new file mode 100644
index 0000000..0745dc6
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget7_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget8_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget8_thumbs.png
new file mode 100644
index 0000000..7cfddf7
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget8_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget9_thumbs.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget9_thumbs.png
new file mode 100644
index 0000000..b0a2bb4
Binary files /dev/null and b/app/templates/orbit_bootstrap/modules/announcement/thumbs/annc_widget9_thumbs.png differ
diff --git a/app/templates/orbit_bootstrap/modules/announcement/thumbs/thumbnail-block-list.png b/app/templates/orbit_bootstrap/modules/announcement/thumbs/thumbnail-block-list.png
deleted file mode 100644
index 55c4ead..0000000
Binary files a/app/templates/orbit_bootstrap/modules/announcement/thumbs/thumbnail-block-list.png and /dev/null differ
diff --git a/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb b/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb
index 558e5cb..761b3e1 100644
--- a/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/archive/_archive_widget1.html.erb
@@ -1,6 +1,3 @@
-<!-- 
-    Archive widget-1 
- -->
 <div class="w-archive  archive-widget-1" module="archive" data-ps="">
   <h3 class="w-archive__widget-title">{{widget-title}}</h3>
   <ul class="w-archive__list  level-1"  data-list="categories" data-level="0">
diff --git a/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb b/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb
index 4c7f236..7e6d6b3 100644
--- a/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb
+++ b/app/templates/orbit_bootstrap/modules/gallery/_widget.html.erb
@@ -10,6 +10,7 @@
   data-cycle-timeout="3000"
   data-cycle-carousel-visible="3"
   data-cycle-pause-on-hover="true"
+  data-cycle-log="false"
   data-cycle-carousel-fluid="true">
     <a class="widget-pic" href="{{link_to_show}}" target="_blank">
       <img src="{{thumb-src}}" alt="">
diff --git a/app/templates/orbit_bootstrap/modules/gallery/_widget1.html.erb b/app/templates/orbit_bootstrap/modules/gallery/_widget1.html.erb
index 2e4b3d6..54ed0c8 100644
--- a/app/templates/orbit_bootstrap/modules/gallery/_widget1.html.erb
+++ b/app/templates/orbit_bootstrap/modules/gallery/_widget1.html.erb
@@ -9,6 +9,8 @@
   data-cycle-fx="carousel"
   data-cycle-timeout="3000"
   data-cycle-carousel-visible="3"
+  data-cycle-log="false"
+  data-cycle-pause-on-hover="true"
   data-cycle-carousel-fluid="true">
     <a class="widget-pic" href="{{link_to_show}}" target="_blank">
       <img src="{{thumb-src}}" alt="">
diff --git a/app/templates/orbit_bootstrap/modules/member/index.html.erb b/app/templates/orbit_bootstrap/modules/member/index.html.erb
index 0246e7c..c593010 100644
--- a/app/templates/orbit_bootstrap/modules/member/index.html.erb
+++ b/app/templates/orbit_bootstrap/modules/member/index.html.erb
@@ -1,13 +1,10 @@
 <div class="index-member index1">
   <div class="index-member-group" data-list="roles" data-level="0">
     <div class="index-member-group-item">
-
       <div class="index-member-status" data-level="1" data-list="status-list">
-      
         <h3 class="index-title">
           <span>{{status-title}}</span>
         </h3>
-
         <div class="index-member-list row" data-level="2" data-list="members">
           <div class="index-member-item clearfix col-sm-6 row" style="font-size: 12px; min-height:180px;">
             <div class="col-sm-4">
diff --git a/app/templates/orbit_bootstrap/partial/_head.html.erb b/app/templates/orbit_bootstrap/partial/_head.html.erb
index b80dbf7..c4e5e11 100644
--- a/app/templates/orbit_bootstrap/partial/_head.html.erb
+++ b/app/templates/orbit_bootstrap/partial/_head.html.erb
@@ -11,6 +11,7 @@
   <%= javascript_include_tag "plugin/modernizr"%>
   <%= javascript_include_tag "plugin/jquery-bullseye-min"%>
   <%= javascript_include_tag "plugin/jquery.cycle2.min"%>
+  <%= javascript_include_tag "plugin/jquery.cycle2.video.min"%>
   <%= javascript_include_tag "app"%>
   <%= javascript_include_tag "#{@dataApi}" if @dataApi != nil%>
   <%= render_google_analytics %>
diff --git a/config/environment.rb b/config/environment.rb
index caa693c..8cb62bd 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -11,6 +11,7 @@ if Site.count == 0
   site.title_translations = {:en=>"Orbit",:zh_tw=>"Orbit"}
   site.valid_locales = [:en, :zh_tw]
   site.in_use_locales = site.valid_locales
+  site.site_type = "orbit"
   site.template = (Dir.glob("#{Rails.root}/app/templates/*").collect{|temp| temp.split('/').last}-['mobile']).first
   site.save
 end