diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index 44ea43f..b8d03dc 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -2,14 +2,14 @@
 
 @import "../initial";
 .default_site_h1{
-      display: contents;
     @media (min-width: 480px){
       font-size: 1.2em!important;
+      display: flex;
+      align-items: center;
      }
     @media (max-width: 480px){
-      font-size: 1.5em!important;
       display: grid;
-      padding: 0 0 0 0.5em !important;
+      padding:0 0 0.5em 0.5em !important;
       .site-logo{
         margin-left: -0.8em;
         width: 100% !important;
@@ -72,14 +72,14 @@
         font-size: 1.5em;
       }
       @media (max-width: 767px) {
-        height: 5em;
+
       }
 
       @media (max-width: 480px) {
-        height: 3.75em;
+
         padding: 0 0.5rem;
         margin: 0;
-        width: 67%;
+        width: 80%;
       }
 
       .site-logo {
diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb
index 405ffb8..8c32071 100644
--- a/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -1,5 +1,5 @@
-<div class="w-ba-banner ad-banner-widget-1 ba-banner-widget-1">
-  <div class="w-ba-banner__wrap  cycle-slideshow"
+<div class="w-ad-banner w-ba-banner ad-banner-widget-1 ba-banner-widget-1">
+  <div class="w-ad-banner__wrap  w-ba-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
       data-cycle-slides=".w-ba-banner__slide"
@@ -15,7 +15,7 @@
       data-cycle-swipe=true
       data-cycle-swipe-fx="scrollHorz"
     >
-    <div class="w-ba-banner__slide {{class}}"
+    <div class="w-ad-banner__slide w-ba-banner__slide {{class}}"
         data-link="{{link}}"
         data-cycle-title="{{title}}"
         data-cycle-desc="{{context}}"
@@ -23,13 +23,13 @@
         data-target="{{target}}"
       >
        <a href="{{link}}" target="{{target}}" title="{{alt_title}}">
-           <img class="w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
+           <img class="w-ad-banner__image w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
        </a>
 
     </div>
   </div>
-  <div class="ad-overlay w-ba-banner__caption w-ad-banner__caption w-ad-banner__overlay_{{subpart-id}}"></div>
-    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
+  <div class="w-ad-banner__caption ad-overlay w-ba-banner__caption w-ad-banner__caption w-ad-banner__overlay_{{subpart-id}}"></div>
+    <div class="w-ad-banner__pager-1 w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
       <li><button title="Slide {{slide_number}}"><span style="display: none;">Slide {{slide_number}}</span></button></li>
     </div>
     <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
@@ -60,10 +60,23 @@
   
 </script>
 <style type="text/css">
-  .controlplay .resume-slide.active i{
+  .w-ba-banner .controlplay .resume-slide.active i{
     color: #32D9C3;
   }
-  .controlplay .pause-slide.active i{
+  .w-ba-banner .controlplay .pause-slide.active i{
     color: #ff4500;
   }
+  .w-ba-banner .controlplay{
+    width: auto;
+  }
+  .w-ba-banner .button-mid{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  .next-button,.prev-button{
+    cursor: pointer;
+  }
 </style>
\ No newline at end of file
diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb
index c80bb92..cb5ee59 100644
--- a/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -1,5 +1,5 @@
-<div class="w-ba-banner ba-banner-widget-1 ba-banner-widget-youtube">
-  <div class="w-ba-banner__wrap  cycle-slideshow"
+<div class="w-ad-banner ad-banner-widget-2 w-ba-banner ba-banner-widget-1 ba-banner-widget-youtube">
+  <div class="w-ad-banner__wrap  w-ba-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
       data-cycle-slides=".w-ba-banner__slide"
@@ -25,11 +25,11 @@
     {{html}}
   </div>
   <div class="ad-overlay w-ad-banner__overlay_{{subpart-id}}"></div>
-    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}"></div>
+    <div class="w-ba-banner__caption w-ad-banner__pager-2 banner-pager banner_caption_{{subpart-id}}"></div>
     <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
     <ul class="button-mid">
-      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="cursor: pointer;"></i>
-      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="cursor: pointer;"></i>
+      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></i>
+      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></i>
     </ul>
   </div>
 </div>
@@ -54,7 +54,6 @@
 if (typeof onYouTubeIframeAPIReady !== 'function'){
   if(window.yt_players == undefined)
     window.yt_players = {};
-  $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]");
   function onYouTubeIframeAPIReady(){
     $(".w-ba-banner").each(function(i,banner){
       var iframes = $(banner).find("iframe");
@@ -74,7 +73,6 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
           delete yt_players[id][k];
         })
         iframes.each(function(i,iframe){
-          console.log($(iframe).attr("id"))
           var yt_player = yt_players[id][$(iframe).attr("id")];
           if(yt_player){
           }else{
@@ -82,10 +80,10 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
                 events: {
                   'onReady': function(event){
                     var height = $(event.target.getIframe()).height();
-                    var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]");
-                    banner_wrap.height(height).css({"padding-bottom":"4em","padding-top":""});
+                    var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_"+id+"\"]");
+                    banner_wrap.height(height).css({"padding-bottom":"","padding-top":""});
                     banner_wrap.find(".cycle-carousel-wrap").css("top","3em");
-                    delete event.target.B.onStateChange;
+                    delete (event.target.B || event.target.H).onStateChange;
                     var onStateChange_idx = event.target.l.i.onStateChange;
                     onStateChange_idx.reverse();
                     var event_size = 3;
@@ -123,6 +121,7 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
     }
     {{extra_state_chnage_script}}
   }
+}
   $(document).ready(function(){
     window.onYouTubePlayerAPIReady = function() {
       onYouTubeIframeAPIReady.apply(this,arguments);
@@ -143,8 +142,10 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
         controlplay.find(".pause-slide").removeClass("active");
       }
     })
+    /*
     var height = opts.slides.filter('.active').height() || opts.slides.height();
-    banner_wrap.height(height).css("padding-bottom","");
+    banner_wrap.height(height)*/
+    banner_wrap.css("padding-bottom","");
     {{extra_document_ready_script}}
     $('.pause-slide').off('click').click(function(){
       $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('pause');
@@ -175,13 +176,25 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
       },300);
     })
   })
-}
 </script>
 <style type="text/css">
-  .controlplay .resume-slide.active i{
+  .w-ba-banner .controlplay .resume-slide.active i{
     color: #32D9C3;
   }
-  .controlplay .pause-slide.active i{
+  .w-ba-banner .controlplay .pause-slide.active i{
     color: #ff4500;
   }
-</style>
\ No newline at end of file
+  .w-ba-banner .controlplay{
+    width: auto;
+  }
+  .w-ba-banner .button-mid{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  .next-button,.prev-button{
+    cursor: pointer;
+  }
+</style>
diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb
index 908b2bc..f6ab3de 100644
--- a/modules/announcement/_annc_widget15.html.erb
+++ b/modules/announcement/_annc_widget15.html.erb
@@ -6,13 +6,20 @@
     <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
   </div>
   <div style="position: absolute;top: 50%;bottom: 50%;width:100%;">
-	<button class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: url(/assets/left-01.png) no-repeat;border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;"><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %></span></button>
-	<button class="btn-right" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="float: right;;height: 2.5em; width: 2.5em;background: url(/assets/right-01.png) no-repeat;background-size: contain;border: 0;position: absolute;transition:.3s;right: 0.6%;"><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %></span></button>
-  </div>
+    <button class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;color: #ffffff;
+      background: rgba(0, 0, 0, 0.2);
+      border-radius: 50%;
+      border: none;"><i class="fa fa-angle-left prev-button" aria-hidden="true" style="font-size: 1.5rem;"></i><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %></span></button>
+    <button class="btn-right" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="float: right;;height: 2.5em; width: 2.5em;background-size: contain;border: 0;position: absolute;transition:.3s;right: 0.6%;color: #ffffff;
+      background: rgba(0, 0, 0, 0.2);
+      border-radius: 50%;
+      border: none;"><i class="fa fa-angle-right next-button" aria-hidden="true" style="font-size: 1.5rem;"></i><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %></span></button>
+    </div>
   <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}}" title="{{img_description}}">
+      <div class="transitionfade"></div>
     </div>
     <div class="w-annc__content-wrap">
       <div class="w-annc__meta">
@@ -121,7 +128,7 @@
 			num=1;
 		}
 	var flag=false;
-	$('.btn-left').click(function(){	
+	$('.btn-left').click(function(){
 		if(!flag){
 			var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray();
 			var ul_length = uls.length;
diff --git a/modules/announcement/annc_index11.html.erb b/modules/announcement/annc_index11.html.erb
index 5df5931..b191161 100644
--- a/modules/announcement/annc_index11.html.erb
+++ b/modules/announcement/annc_index11.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-11 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/announcement/annc_index12.html.erb b/modules/announcement/annc_index12.html.erb
index e478a9f..3e1dbc6 100644
--- a/modules/announcement/annc_index12.html.erb
+++ b/modules/announcement/annc_index12.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-12 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/announcement/annc_index15.html.erb b/modules/announcement/annc_index15.html.erb
index 55ddde9..a521e5f 100644
--- a/modules/announcement/annc_index15.html.erb
+++ b/modules/announcement/annc_index15.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-15 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/announcement/annc_index16.html.erb b/modules/announcement/annc_index16.html.erb
index 006afa4..07e10c5 100644
--- a/modules/announcement/annc_index16.html.erb
+++ b/modules/announcement/annc_index16.html.erb
@@ -1,6 +1,6 @@
 <div class="i-annc  index-announcement-16 {{display}}">
   <h3 class="i-annc__page-title">{{page-title}}</h3>
-  <table class="i-annc__table  table  table-striped dt-responsive nowrap">
+  <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
         <th class="i-annc__th  i-annc__th--date all" id='date'>{{date-head}}</th>
diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb
index 4f0adf9..03a8232 100644
--- a/modules/announcement/show.html.erb
+++ b/modules/announcement/show.html.erb
@@ -11,17 +11,6 @@
   .s-annc__sub-img.pull-left {
     margin-right: 2em;
   }
-  strong.carousel__description {
-    color: white;
-  }
-  .carousel_images{
-    {{carousel_display_style}}
-  }
-  @media (max-width: 767px){
-    .carousel_images{
-      width: 100%;
-    }
-  }
 </style>
 <article class="s-annc show-announcement">
   <h1 class="s-annc__show-title">{{title}}</h1>
@@ -51,7 +40,7 @@
     <div class="s-annc__subtitle">{{subtitle_ann}}</div>
     <div class="s-annc__post-body">{{body}}</div>
   </section>
-  
+  <div id="sub_anncs_list">{{sub_anncs_text}}</div>
   <ul class="s-annc__related-wrap list-unstyled no-print">
     <li class="s-annc__related-file">
       <i class="fa fa-fw fa-paperclip"></i>
@@ -69,169 +58,8 @@
   </ul>
 
 </article>
-<div class="carousel_images">
-  <div class="w-ba-banner ba-banner-widget-1">
-    <div class="w-ba-banner__wrap  cycle-slideshow"
-        data-list="bulletin_carousel_images"
-        data-level="0"
-        data-cycle-slides=".bulletin_carousel_slide"
-        data-cycle-log="false"
-        data-cycle-auto-height="0"
-        data-cycle-speed="300"
-        data-cycle-timeout="5000"
-        data-cycle-fx="fade"
-        data-pager-active-class="active-slide"
-        data-cycle-swipe=true
-        data-cycle-swipe-fx="scrollHorz"
-      >
-      <div class="w-ba-banner__slide bulletin_carousel_slide"
-          data-cycle-title="{{description_text}}"
-        >
-             <img class="w-ba-banner__image banner-responsive" src="{{src}}" alt="{{description_text}}">
-             <div class="ad-overlay w-ad-banner__overlay bulletin_carousel__overlay">
-               <p><strong class="carousel__description">{{description}}</strong></p>
-             </div>
-             <div class="transitionfade"></div>
-      </div>
-    </div>
-      <ul class="controlplay"><a class="resume-slide" title = "{{resume_btn_title}}"><i></i></a><a class="pause-slide" title = "{{pause_btn_title}}"><i></i></a></ul>
-    <ul class="button-mid">
-      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "{{prev_btn_title}}"></i>
-      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "{{next_btn_title}}"></i>
-    </ul>
-  </div>
-  <div style="position: relative;">
-    <h4><span class="active_slide">1</span>/{{carousel_count}}</h4>
-    <ul class="carousel_images_slide w-annc__list  row list-unstyled" data-level="0" data-list="bulletin_carousel_images">
-      <li class="carousel_img_item  col-sm-3">
-      <div class="carousel_img-wrap">
-        <img class="carousel_img" src="{{src}}" alt="{{description_text}}">
-      </div>
-      </li>
-    </ul>
-    <ul class="button-mid">
-      <i class="fa fa-angle-left prev-button prev_img" aria-hidden="true" title = "{{prev_btn_title}}"></i>
-      <i class="fa fa-angle-right next-button next_img" aria-hidden="true" title = "{{next_btn_title}}"></i>
-    </ul>
-  </div>
-</div>
-
+{{carousel_html}}
 {{link_to_edit}}
-<style type="text/css">
-  .carousel_img_item{
-    display: none;
-    float: left;
-  }
-  .controlplay {
-    position: absolute;
-    right: 1em;
-    top: 3%;
-    z-index: 200;
-  }
-  .controlplay a {
-    display: inline-block;
-    margin-right: 0.25em;
-    cursor: pointer;
-    padding: 5px 10px;
-    border: 1px solid rgba(255,255,255,0.5);
-    background: rgba(0,0,0,0.2);
-  }
-  .controlplay a i {
-    font-family: FontAwesome;
-    position: relative;
-    font-size: 1rem;
-    line-height: 1;
-    color: #FFF;
-    vertical-align: middle;
-    font-style: unset;
-  }
-  .controlplay .resume-slide i::before {
-    content: "\f04b";
-  }
-  .controlplay .pause-slide i::before {
-    content: "\f04c";
-  }
-  ul.button-mid .prev-button {
-      transition: 0.4s;
-      position: relative;
-      float: left;
-      left: 0.5rem;
-      width: 2.5rem;
-      height: 2.5rem;
-      font-size: 2.2rem;
-      color: #ffffff;
-      background: rgba(0,0,0,0.2);
-      text-align: center;
-      line-height: 2.5rem;
-      top: 50%;
-      position: absolute;
-      transform: translateY(-50%);
-      z-index: 999;
-  }
-  ul.button-mid .next-button {
-      float: right;
-      transition: 0.4s;
-      position: relative;
-      right: 0.5rem;
-      width: 2.5rem;
-      height: 2.5rem;
-      font-size: 2.2rem;
-      color: #fff;
-      background: rgba(0,0,0,0.2);
-      text-align: center;
-      line-height: 2.5rem;
-      top: 50%;
-      position: absolute;
-      transform: translateY(-50%);
-      z-index: 999;
-  }
-  .carousel_images_slide{
-    padding: 3em;
-  }
-  .carousel_img_item img{
-    cursor: pointer;
-  }
-  @media (max-width: 479px){
-    .carousel_img_item:nth-child(-n+1){
-      display: block;
-      width: 100%;
-      float: left;
-    }
-    .carousel_img_item{
-      width: 100%;
-    }
-  }
-  @media (min-width: 480px){
-    .carousel_img_item:nth-child(-n+2){
-      display: block;
-      width: 50%;
-      float: left;
-    }
-    .carousel_img_item{
-      width: 50%;
-    }
-  }
-  @media (min-width: 768px){
-    .carousel_img_item:nth-child(-n+3){
-      display: block;
-      width: 33%;
-      float: left;
-    }
-    .carousel_img_item{
-      width: 33%;
-    }
-  }
-  @media (min-width: 1280px){
-    .carousel_img_item:nth-child(-n+4){
-      display: block;
-      width: 25%;
-      float: left;
-    }
-    .carousel_img_item{
-      width: 25%;
-    }
-  }
-</style>
 <script>
   (function($) {
 
@@ -250,110 +78,6 @@
     
     // Links
     hideEmptyEl($('.s-annc__link-title'), $('.s-annc__related-link'));
-  
     $("img[src='']").remove();
-    $('.pause-slide').click(function(){
-      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('pause');
-    });
-    $('.resume-slide').click(function(){
-      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('resume');
-    });
-    $('.next-button').off('click').on('click',function(){
-      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("next");
-    })
-    $('.prev-button').off('click').on('click',function(){
-      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev");
-    })
-    window.active_slide = 0;
-    $('.prev_img').off('click').on('click',function(){
-      var carousel_images_slide = $('.carousel_images_slide');
-      var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide);
-      if(carousel_images_slide_first_child.length > 0){
-        var content_size = Math.floor((carousel_images_slide.outerWidth() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.outerWidth(true));
-        content_size = Math.max(content_size,1);
-        if(carousel_images_slide.find(">li").length > content_size && active_slide > 0){
-          active_slide -= content_size;
-          carousel_images_slide.find(">li").css("display","none");
-          for(var i = active_slide; i < active_slide + content_size;i++){
-            carousel_images_slide.find(">li").eq(i).css("display","block");
-          }
-        }
-      }
-    })
-    $('.next_img').off('click').on('click',function(){
-      var carousel_images_slide = $('.carousel_images_slide');
-      var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide);
-      if(carousel_images_slide_first_child.length > 0){
-        var content_size = Math.floor((carousel_images_slide.outerWidth() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.outerWidth(true));
-        content_size = Math.max(content_size,1);
-        var li_length = carousel_images_slide.find(">li").length;
-        if(li_length > content_size){
-          active_slide += content_size;
-          active_slide = Math.min(active_slide,li_length - 1);
-          carousel_images_slide.find(">li").css("display","none");
-          for(var i = active_slide; i < active_slide + content_size;i++){
-            carousel_images_slide.find(">li").eq(i).css("display","block");
-          }
-        }
-      }
-
-    })
-    $(".carousel_img_item img").off("click").on("click",function(){
-      $(".carousel_images .cycle-slideshow").cycle($(this).index(".carousel_img_item img"));
-    })
-    $(document).ready(function(){
-      $(".carousel_images .cycle-slideshow").cycle('pause');
-      var carousel_image_block_width = $('.carousel_images').width();
-      var heights = $(".bulletin_carousel_slide").map(function(i,v){
-        return $(v).height() * carousel_image_block_width / $(v).width();
-      })
-      var max_height = Math.max.apply(null,heights);
-      $(".bulletin_carousel_slide").each(function(i,v){
-        $(v).height(max_height);
-      })
-      $(".carousel_images .cycle-slideshow").cycle('resume');
-      $('.cycle-slideshow').on('cycle-after',function(){
-        $(".active_slide").text($('.bulletin_carousel_slide.cycle-slide-active').index());
-      })
-    })
-    $(window).on("load",function(){
-      $(".carousel_images .cycle-slideshow").cycle('pause');
-      var carousel_image_block_width = $('.carousel_images').width();
-      var heights = $(".bulletin_carousel_slide").map(function(i,v){
-        return $(v).height() * carousel_image_block_width / $(v).width();
-      })
-      var max_height = Math.max.apply(null,heights);
-      $(".bulletin_carousel_slide").each(function(i,v){
-        $(v).height(max_height);
-      })
-      $(".carousel_images .cycle-slideshow").cycle('resume');
-    })
-    $(window).resize(function(){
-      var carousel_images_slide = $('.carousel_images_slide');
-      var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide);
-      if(carousel_images_slide_first_child.length > 0){
-        var content_size = Math.floor((carousel_images_slide.outerWidth() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.outerWidth(true));
-        content_size = Math.max(content_size,1);
-        carousel_images_slide.find(">li").css("display","none");
-        var active_count = carousel_images_slide.find(">li").length - active_slide;
-        if(active_count < content_size){
-          active_slide -= (content_size - active_count);
-        }
-        active_slide = Math.max(active_slide,0);
-        console.log(content_size)
-        for(var i = active_slide; i < active_slide + content_size;i++){
-          carousel_images_slide.find(">li").eq(i).css("display","block");
-        }
-      }
-      var carousel_image_block_width = $('.carousel_images').width();
-      $(".bulletin_carousel_slide").css("height",'');
-      var heights = $(".bulletin_carousel_slide").map(function(i,v){
-        return $(v).height() * carousel_image_block_width / $(v).width();
-      })
-      var max_height = Math.max.apply(null,heights);
-      $(".bulletin_carousel_slide").each(function(i,v){
-        $(v).height(max_height);
-      })
-    })
   }(jQuery));
 </script>
\ No newline at end of file
diff --git a/modules/archive/archive_index1.html.erb b/modules/archive/archive_index1.html.erb
index 725165d..b96a830 100644
--- a/modules/archive/archive_index1.html.erb
+++ b/modules/archive/archive_index1.html.erb
@@ -1,5 +1,5 @@
 <div class="i-archive  index-archive-1">
-  <h3 class="i-archive__page-title">{{page-title}}</h3>
+  <h3 class="i-archive-title">{{page-title}}</h3>
   <ul class="i-archive__list list-unstyled" data-list="categories" data-level="0">
     <li class="i-archive__item">
       <h4 class="i-archive__category-title">{{category-title}}</h4>
diff --git a/modules/archive/archive_index10.html.erb b/modules/archive/archive_index10.html.erb
new file mode 100644
index 0000000..c585b12
--- /dev/null
+++ b/modules/archive/archive_index10.html.erb
@@ -0,0 +1,32 @@
+<div class="i-archive index-archive-5 index-archive-10">
+  <h3 class="i-archive-title">
+    <span>{{page-title}}</span>
+  </h3>
+  <div class="i-archive__list list-unstyled" id="index-archive-group" data-list="categories" data-level="0">
+   <h4 class="i-archive__category-title">{{category-title}}</h4>
+    <table class="i-items table table-bordered">
+        <thead class="thead row">
+          <tr>
+            <th class="col-sm-2 date-thead">{{serial_number-head}}</th>
+            <th class="col-sm-7 title-thead">{{title-head}}</th>
+            <th class="col-sm-3 file-thead">{{file-head}}</th>
+          </tr>
+        </thead>
+        <tbody class="tbody i-archive__category-list" data-list="archives" data-level="1">
+          <tr class="archive-items">
+            <td class="i-archive__serial_number col-sm-2">{{idx}}</td>
+            <td class="head col-sm-7">
+               {{archive-title}}
+               <span class="i-archive__status-wrap" data-list="statuses" data-level="2">
+               <span class="i-archive__status  label  status  {{status-class}}">{{status}}</span>
+             </span>
+            </td>
+            <td class="i-archive__file-list col-sm-3" data-list="files" data-level="2">
+              <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary">{{file-type}}</span></a>
+            </td>
+          </tr>
+        </tbody>
+      </div>
+    </table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/modules/archive/archive_index11.html.erb b/modules/archive/archive_index11.html.erb
new file mode 100644
index 0000000..1ba6aa7
--- /dev/null
+++ b/modules/archive/archive_index11.html.erb
@@ -0,0 +1,34 @@
+<div class="i-archive index-archive-9">
+  <h3 class="i-archive-title">
+    <span>{{page-title}}</span>
+  </h3>
+  <div class="i-archive__list list-unstyled" id="index-archive-group" data-list="categories" data-level="0">
+    <h4 class="i-archive__category-title">{{category-title}}</h4>
+    <table class="i-items table table-bordered">
+      <thead class="thead">
+        <tr>
+          <th class="col-sm-2 title-thead">{{serial_number-head}}</th>
+          <th class="col-sm-7 title-thead">{{title-head}}</th>
+          <th class="col-sm-3 file-thead">{{file-head}}</th>
+        </th>
+      </thead>  
+      <tbody class="tbody" >
+        <span data-list="archives" data-level="1">
+          <span data-list="files" data-level="2">
+            <tr class="archive-items">
+              <td class="col-sm-2">
+                <span class="i-archive__serial_number">{{serial_number}}</span>
+              </td>
+              <td class="col-sm-7">
+                <a class="i-archive__file-name" href="{{file-url}}" target="_blank" title="{{file-name}}">{{file-name}}</a>
+              </td>
+              <td class="col-sm-3">
+                <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary">{{file-type}}</span></a>
+              </td>
+            </tr>
+          </span>
+        </span>
+      </tbody>
+    </table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/modules/archive/archive_index3.html.erb b/modules/archive/archive_index3.html.erb
index fc78836..ad5e1ad 100644
--- a/modules/archive/archive_index3.html.erb
+++ b/modules/archive/archive_index3.html.erb
@@ -1,5 +1,5 @@
 <div class="i-archive  index-archive-3">
-  <h3 class="i-archive__page-title">{{page-title}}</h3>
+  <h3 class="i-archive-title">{{page-title}}</h3>
   <ul class="i-archive__list list-unstyled" data-list="categories" data-level="0">
     <li class="i-archive__item">
       <h4 class="i-archive__category-title">{{category-title}}</h4>
diff --git a/modules/archive/archive_index7.html.erb b/modules/archive/archive_index7.html.erb
index cd4449f..097115b 100644
--- a/modules/archive/archive_index7.html.erb
+++ b/modules/archive/archive_index7.html.erb
@@ -6,23 +6,23 @@
    <h4 class="i-archive__category-title">{{category-title}}</h4>
     <div class="i-items">
         <div class="thead row">
-          <div class="col-sm-2 date-thead">上傳日期</div>
-          <div class="col-sm-3 title-thead">標題</div>
+          <div class="col-sm-2 date-thead">{{date-head}}</div>
+          <div class="col-sm-4 title-thead">{{title-head}}</div>
           <div class="col-sm-3 description-thead">{{description-head}}</div>
-          <div class="col-sm-2 file-thead">檔案下載</div>
+          <div class="col-sm-3 file-thead">{{file-head}}</div>
           </div>
         <div class="tbody">
           <div class="i-archive__category-list list-unstyled" data-list="archives" data-level="1">
           <div class="archive-items clearfix">
               <div class="date col-sm-2">{{created_at}}</div>
-              <div class="head col-sm-3">
+              <div class="head col-sm-4">
                  {{archive-title}}
                  <span class="i-archive__status-wrap" data-list="statuses" data-level="2">
                  <span class="i-archive__status  label  status  {{status-class}}">{{status}}</span>
                </span>
               </div>
               <div class="description col-sm-3" style="border-right: 0.05em solid #333;">{{description}}</div>
-              <div class="i-archive__file-list col-sm-2" data-list="files" data-level="2">
+              <div class="i-archive__file-list col-sm-3" data-list="files" data-level="2">
                 <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary">{{file-type}}</span></a>
               </div>
               </div>
@@ -34,11 +34,6 @@
 </div>
 
 <script>
-if( window.location.href.indexOf('/en/') > -1 ) {
-  $('.date-thead').replaceWith('<div class="col-sm-2 date-thead-en">Updated At</div>')
-  $('.title-thead').replaceWith('<div class="col-sm-7 title-thead-en">Title</div>')
-  $('.file-thead').replaceWith('<div class="col-sm-3 file-thead-en">Download file</div>')
-}
 $(document).ready(function(){
   if(window.innerWidth >= 768){
     $(".archive-items .date").each(function(i,d){
diff --git a/modules/archive/archive_index8.html.erb b/modules/archive/archive_index8.html.erb
index 6e6ef93..35b2e0b 100644
--- a/modules/archive/archive_index8.html.erb
+++ b/modules/archive/archive_index8.html.erb
@@ -6,16 +6,16 @@
    <h4 class="i-archive__category-title">{{category-title}}</h4>
     <div class="i-items">
         <div class="thead row">
-          <div class="col-sm-2 date-thead">上傳日期</div>
-          <div class="col-sm-3 title-thead">標題</div>
+          <div class="col-sm-2 date-thead">{{date-head}}</div>
+          <div class="col-sm-4 title-thead">{{title-head}}</div>
           <div class="col-sm-3 description-thead">{{description-head}}</div>
-          <div class="col-sm-2 file-thead">檔案下載</div>
+          <div class="col-sm-3 file-thead">{{file-head}}</div>
           </div>
         <div class="tbody">
           <div class="i-archive__category-list list-unstyled" data-list="archives" data-level="1">
           <div class="archive-items clearfix">
               <div class="date col-sm-2">{{created_at}}</div>
-              <div class="head col-sm-3">
+              <div class="head col-sm-4">
                 <dl class="i-archive__file" data-list="files"  data-level="2">
                 <div class="file-name">
                   <a class="i-archive__file-name" href="{{file-url}}" target="_blank" title="{{file-name}}">{{file-name}}</a>
@@ -26,7 +26,7 @@
                 </dl>
               </div>
               <div class="description col-sm-3">{{description}}</div>
-              <div class="i-archive__file-list col-sm-2" data-list="files" data-level="2">
+              <div class="i-archive__file-list col-sm-3" data-list="files" data-level="2">
               <div class="file-item">
                 <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary">{{file-type}}</span></a>
               </div>
@@ -37,12 +37,4 @@
       </div>
     </div>
   </div>
-</div>
-
-<script>
-if( window.location.href.indexOf('/en/') > -1 ) {
-  $('.date-thead').replaceWith('<div class="col-sm-2 date-thead-en">Updated At</div>')
-  $('.title-thead').replaceWith('<div class="col-sm-7 title-thead-en">Title</div>')
-  $('.file-thead').replaceWith('<div class="col-sm-3 file-thead-en">Download file</div>')
-}
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/modules/archive/archive_index9.html.erb b/modules/archive/archive_index9.html.erb
new file mode 100644
index 0000000..839160f
--- /dev/null
+++ b/modules/archive/archive_index9.html.erb
@@ -0,0 +1,30 @@
+<div class="i-archive index-archive-9">
+  <h3 class="i-archive-title">
+    <span>{{page-title}}</span>
+  </h3>
+  <div class="i-archive__list list-unstyled" id="index-archive-group" data-list="categories" data-level="0">
+    <h4 class="i-archive__category-title">{{category-title}}</h4>
+    <table class="i-items table table-bordered">
+      <thead class="thead">
+        <tr>
+          <th class="col-sm-8 title-thead">{{title-head}}</th>
+          <th class="col-sm-4 file-thead">{{file-head}}</th>
+        </th>
+      </thead>  
+      <tbody class="tbody" >
+        <span data-list="archives" data-level="1">
+          <span data-list="files" data-level="2">
+            <tr class="archive-items">
+              <td class="col-sm-8">
+                <a class="i-archive__file-name" href="{{file-url}}" target="_blank" title="{{file-name}}">{{file-name}}</a>
+              </td>
+              <td class="col-sm-4">
+                <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary">{{file-type}}</span></a>
+              </td>
+            </tr>
+          </span>
+        </span>
+      </tbody>
+    </table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/modules/archive/info.json b/modules/archive/info.json
index e3fa484..a88c353 100644
--- a/modules/archive/info.json
+++ b/modules/archive/info.json
@@ -1 +1,110 @@
-{"frontend":[{"filename":"archive_index1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"1. List (widget-title, category, filename, download link)"},"thumbnail":"ar1.png"},{"filename":"archive_index2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"2. Accordion list (widget-title, category, filename, download link)"},"thumbnail":"ar2.png"},{"filename":"archive_index3","name":{"zh_tw":"3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )","en":"3. List(no filename) (widget-title, category, download link)"},"thumbnail":"ar3.png"},{"filename":"archive_index4","name":{"zh_tw":"4. 手風琴式列表( 無檔案名稱  ( 模組標題, 類別標題, 下載連結 )","en":"4. Accordion list(no filename) (widget-title, category, download link)"},"thumbnail":"ar4.png"},{"filename":"archive_index5","name":{"zh_tw":"5. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"5. Table list (widget-title, category, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index6","name":{"zh_tw":"6. 表格列表 ( 模組標題, 檔案名稱, 下載連結 )","en":"6. Table list (widget-title, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index7","name":{"zh_tw":"7. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"7. Table list (widget-title, category, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index8","name":{"zh_tw":"8. 表格列表 ( 模組標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"8. Table list (widget-title, filename, download link)"},"thumbnail":"ar5.png"}],"widgets":[{"filename":"archive_widget1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )","en":"1. List (widget-title, category, link of download page)"},"thumbnail":"thumb.png"},{"filename":"archive_widget2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )","en":"2. Accordion list (widget-title, category, link of download page)"},"thumbnail":"thumb.png"}]}
\ No newline at end of file
+{
+  "frontend": [
+    {
+      "filename": "archive_index1",
+      "name": {
+        "zh_tw": "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )",
+        "en": "1. List (widget-title, category, filename, download link)"
+      },
+      "thumbnail": "ar1.png"
+    },
+    {
+      "filename": "archive_index2",
+      "name": {
+        "zh_tw": "2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )",
+        "en": "2. Accordion list (widget-title, category, filename, download link)"
+      },
+      "thumbnail": "ar2.png"
+    },
+    {
+      "filename": "archive_index3",
+      "name": {
+        "zh_tw": "3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )",
+        "en": "3. List(no filename) (widget-title, category, download link)"
+      },
+      "thumbnail": "ar3.png"
+    },
+    {
+      "filename": "archive_index4",
+      "name": {
+        "zh_tw": "4. 手風琴式列表( 無檔案名稱  ( 模組標題, 類別標題, 下載連結 )",
+        "en": "4. Accordion list(no filename) (widget-title, category, download link)"
+      },
+      "thumbnail": "ar4.png"
+    },
+    {
+      "filename": "archive_index5",
+      "name": {
+        "zh_tw": "5. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )",
+        "en": "5. Table list (widget-title, category, filename, download link)"
+      },
+      "thumbnail": "ar5.png"
+    },
+    {
+      "filename": "archive_index6",
+      "name": {
+        "zh_tw": "6. 表格列表 ( 模組標題, 檔案名稱, 下載連結 )",
+        "en": "6. Table list (widget-title, filename, download link)"
+      },
+      "thumbnail": "ar5.png"
+    },
+    {
+      "filename": "archive_index7",
+      "name": {
+        "zh_tw": "7. 表格列表 ( 模組標題, 類別標題, 上傳日期, 檔案名稱, 檔案簡介, 下載連結 )",
+        "en": "7. Table list (widget-title, category, Updated At, filename, download link)"
+      },
+      "thumbnail": "ar5.png"
+    },
+    {
+      "filename": "archive_index8",
+      "name": {
+        "zh_tw": "8. 表格列表 ( 模組標題, 上傳日期, 檔案名稱, 檔案簡介, 下載連結 )",
+        "en": "8. Table list (widget-title, Updated At, filename, download link)"
+      },
+      "thumbnail": "ar5.png"
+    },
+    {
+      "filename": "archive_index9",
+      "name": {
+        "zh_tw": "9. 表格列表 - 簡約 ( 模組標題, 檔案名稱, 下載連結 )",
+        "en": "9. Table list - Simple (widget-title, download link)"
+      },
+      "thumbnail": "ar9.png"
+    },
+    {
+      "filename": "archive_index10",
+      "name": {
+        "zh_tw": "10. 表格列表 ( 模組標題, 類別標題, 編號,  檔案名稱, 下載連結 )",
+        "en": "10. Table list (widget-title, category, Serial Number, filename, download link)"
+      },
+      "thumbnail": "ar5.png"
+    },
+    {
+      "filename": "archive_index11",
+      "name": {
+        "zh_tw": "11. 表格列表 - 簡約 - 展開檔案 ( 模組標題, 類別標題, 編號,  檔案名稱, 下載連結 )",
+        "en": "11. Table list - Simple - Unfold Files (widget-title, category, Serial Number, filename, download link)"
+      },
+      "thumbnail": "ar9.png"
+    }
+  ],
+  "widgets": [
+    {
+      "filename": "archive_widget1",
+      "name": {
+        "zh_tw": "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )",
+        "en": "1. List (widget-title, category, link of download page)"
+      },
+      "thumbnail": "thumb.png"
+    },
+    {
+      "filename": "archive_widget2",
+      "name": {
+        "zh_tw": "2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )",
+        "en": "2. Accordion list (widget-title, category, link of download page)"
+      },
+      "thumbnail": "thumb.png"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/modules/archive/thumbs/ar9.png b/modules/archive/thumbs/ar9.png
new file mode 100644
index 0000000..8b11bb7
Binary files /dev/null and b/modules/archive/thumbs/ar9.png differ
diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb
index 7d4f475..6062e09 100644
--- a/modules/member/member_index2.html.erb
+++ b/modules/member/member_index2.html.erb
@@ -35,8 +35,8 @@
       $('.i-member img').eq(i).parent().attr('title','noname');
 		}
 	}
-	for(var i = 0;i < $('.i-member span a').length ; i++){
-		if($('.i-member span a').eq(i).html().trim().replace('&nbsp;','') == "")
-			$('.i-member span a').eq(i).html('noname');
+	for(var i = 0;i < $('.i-member span.member-data-value-name a').length ; i++){
+		if($('.i-member span.member-data-value-name a').eq(i).html().trim().replace('&nbsp;','') == "")
+			$('.i-member span.member-data-value-name a').eq(i).html('noname');
 	}
 </script>
\ No newline at end of file
diff --git a/modules/member/show.html.erb b/modules/member/show.html.erb
index 66c0f89..ea66f67 100644
--- a/modules/member/show.html.erb
+++ b/modules/member/show.html.erb
@@ -21,7 +21,7 @@
         {{data_intro_title}}
       </div>
 
-      <table class="table table-hover table-striped dt-responsive nowrap {{complete_display}}">
+      <table class="table table-hover table-striped dt-responsive {{complete_display}}">
         <thead>
           <tr data-list="pd_title" data-level="1">
             <th>{{plugin_data_title}}</th>
diff --git a/modules/personal_activity/index.html.erb b/modules/personal_activity/index.html.erb
index 6c80469..36ad70f 100644
--- a/modules/personal_activity/index.html.erb
+++ b/modules/personal_activity/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index activities-index dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index activities-index dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/personal_course/index.html.erb b/modules/personal_course/index.html.erb
index 53f10cc..83fd717 100644
--- a/modules/personal_course/index.html.erb
+++ b/modules/personal_course/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index courses-index dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index courses-index dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/personal_honor/index.html.erb b/modules/personal_honor/index.html.erb
index 119a0b9..831e4c3 100644
--- a/modules/personal_honor/index.html.erb
+++ b/modules/personal_honor/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index personal-honor dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index personal-honor dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr data-level="0" data-list="headers">
diff --git a/modules/personal_lab/index.html.erb b/modules/personal_lab/index.html.erb
index a469853..b22a8de 100644
--- a/modules/personal_lab/index.html.erb
+++ b/modules/personal_lab/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index personal-lab dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index personal-lab dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/personal_research/index.html.erb b/modules/personal_research/index.html.erb
index 180bbab..6538b0b 100644
--- a/modules/personal_research/index.html.erb
+++ b/modules/personal_research/index.html.erb
@@ -1,4 +1,4 @@
-<table class="table table-hover table-striped projects-index personal-researchs  dt-responsive nowrap">
+<table class="table table-hover table-striped projects-index personal-researchs  dt-responsive">
   <caption><h3>{{widget-title}}</h3></caption>
   <thead>
     <tr>
diff --git a/modules/text_marquee/_widget.html.erb b/modules/text_marquee/_widget.html.erb
index e001a7d..46b61ad 100644
--- a/modules/text_marquee/_widget.html.erb
+++ b/modules/text_marquee/_widget.html.erb
@@ -3,35 +3,29 @@
 		<li>{{content}}</li>
 	</ul>
 </div>
- 
+
 <script type="text/javascript">
 	(function(){
 		var main_div = $("div[data-subpart-id={{subpart-id}}]"),
 			total_texts = main_div.find("ul li").length - 1,
 			current_text = 0,
-			last_text = 0;
-
+			last_text = 0,
+			speed = 3000;
 		main_div.find("ul li").hide();
-		var textTransform = function(){
-			current_text++;
+		function textTransform(){
 			current_text = (current_text > total_texts ? 0 : current_text);
 			last_text = (current_text == 0 ? total_texts : current_text - 1);
-			speed = $('.marquee > li > a').eq(current_text).attr('speed');
-			main_div.find("ul li").eq(last_text).slideUp(500);
-			main_div.find("ul li").eq(current_text).slideDown(500);
+			speed = main_div.find("ul li").eq(current_text).find("> a").eq(0).attr('speed');
+			main_div.find("ul li").eq(last_text).slideUp({duration: 500, queue: true});
+			main_div.find("ul li").eq(current_text).slideDown({duration: 500, queue: true});
+			current_text++;
 			if(total_texts > 0){
-				setTimeout(textTransform,speed);
+				if(window["{{subpart-id}}_time_out_id"])
+					clearTimeout(window["{{subpart-id}}_time_out_id"]);
+				window["{{subpart-id}}_time_out_id"] = setTimeout(textTransform,speed);
 			}
+			return;
 		}
-		setTimeout(textTransform,500);
+		textTransform();
 	})();
-</script>
-	
-<script type="text/javascript">
-	(function(){
-		var main_div = $("div[data-subpart-id"{{subpart-id}})
-	}	
-</script>
-	
-
-
+</script>
\ No newline at end of file
diff --git a/modules/text_marquee/info.json b/modules/text_marquee/info.json
index 40b4be6..dc4f6df 100644
--- a/modules/text_marquee/info.json
+++ b/modules/text_marquee/info.json
@@ -1,12 +1,12 @@
-{
-    "widgets" : [
-        {
-            "filename" : "widget",
-            "name" : {
-                "zh_tw" : "跑馬燈",
-                "en" : "marquee"
-                },
-            "thumbnail" : "thumb.png"
-        }
-    ]
+{
+    "widgets" : [
+        {
+            "filename" : "widget",
+            "name" : {
+                "zh_tw" : "跑馬燈",
+                "en" : "marquee"
+                },
+            "thumbnail" : "thumb.png"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb
index 5b3ef48..80c965b 100644
--- a/modules/web_resource/_web_res_widget1.html.erb
+++ b/modules/web_resource/_web_res_widget1.html.erb
@@ -4,6 +4,9 @@
   </h3>
   <ul class="list-unstyled" data-level="0" data-list="web_link">
     <li class="widget-content">
+      <div class="link-img-wrap{{display_image}}">
+        <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      </div>
       <a class="widget-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
       <span data-list="statuses" data-level="1">
         <span class="label status {{status-class}}">{{status}}</span>
diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb
index b85221e..017ce7f 100644
--- a/modules/web_resource/_web_res_widget2.html.erb
+++ b/modules/web_resource/_web_res_widget2.html.erb
@@ -4,6 +4,9 @@
   </h3>
   <ul class="list-unstyled" data-level="0" data-list="web_link">
     <li class="widget-content widget-content-horizontal">
+      <div class="link-img-wrap{{display_image}}">
+        <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      </div>
       <a class="widget-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
       <span data-list="statuses" data-level="1">
         <span class="label status {{status-class}}">{{status}}</span>
diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb
index f225a23..040dde9 100644
--- a/modules/web_resource/web_res_index1.html.erb
+++ b/modules/web_resource/web_res_index1.html.erb
@@ -4,13 +4,18 @@
   </h1>
   <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="{{title_text}}">{{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>
+      <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">
+        <h4>
+          <div class="link-img-wrap{{display_image}}">
+            <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+          </div>
+          {{title}}
+          <span data-list="statuses" data-level="1">
+            <span class="label status {{status-class}}">{{status}}</span>
+          </span>
+        </h4>
+        <small class="index-context">{{context}}</small>
+      </a>
     </li>
   </ul>
 </div>
diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb
index 6432ea6..86db2aa 100644
--- a/modules/web_resource/web_res_index2.html.erb
+++ b/modules/web_resource/web_res_index2.html.erb
@@ -4,13 +4,20 @@
   </h1>
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content col-md-4 col-sm-4">
-      <h4>
-        <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{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>
+      <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">
+        <div class="link-img-wrap{{display_image}}">
+          <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        </div>
+        <h4>
+          <span class="link-title">
+            {{title}}
+          </span>
+          <span data-list="statuses" data-level="1">
+            <span class="label status {{status-class}}">{{status}}</span>
+          </span>
+        </h4>
+        <small class="index-context">{{context}}</small>
+      </a>
     </li>
   </ul>
 </div>
diff --git a/template.json b/template.json
index 86b013f..0299aad 100644
--- a/template.json
+++ b/template.json
@@ -1 +1 @@
-{"key":"asia_kstyle4","title":"asia_Kstyle4","author":"kenlee","thumbnail":"assets/images/design_thumb.png"}
\ No newline at end of file
+{"key":"asia_kstyle4","title":"asia_kstyle4","author":"kenlee","thumbnail":"assets/images/design_thumb.png"}
\ No newline at end of file
diff --git a/widgets/site_menu_widget/_site_menu_widget1.html.erb b/widgets/site_menu_widget/_site_menu_widget1.html.erb
index 99b9454..149b3a0 100644
--- a/widgets/site_menu_widget/_site_menu_widget1.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget1.html.erb
@@ -3,7 +3,7 @@
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
 	<h3 class="sitemenu-title">{{widget_title}}</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
-		<li class="sitemenu-item level-1">
+		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
 			<ul class="sitemenu-list level-2" data-list="children" data-level="1">
 				<li class="sitemenu-item level-2" style="position: relative;">
diff --git a/widgets/site_menu_widget/_site_menu_widget2.html.erb b/widgets/site_menu_widget/_site_menu_widget2.html.erb
index 8462dc4..9b5f716 100644
--- a/widgets/site_menu_widget/_site_menu_widget2.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget2.html.erb
@@ -3,7 +3,7 @@
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
 	<h3 class="sitemenu-title">{{widget_title}}</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
-		<li class="sitemenu-item level-1">
+		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
 			<ul class="sitemenu-list level-2" data-list="children" data-level="1">
 				<li class="sitemenu-item level-2" style="position: relative;">