diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index f9155c8..dedbabc 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -1,6 +1,7 @@
 ;(function($, win, undefined) {
   // ECMAScript 5 嚴格模式
   'use strict';
+
     //header fixed在上方
   function initdata1() {
         if ( $('.homebanner').length != 0) {
@@ -412,6 +413,7 @@
     orbit.goBackTop('top', 800);
     orbit.plugins.bullEye();
     orbit.setColumn('.left-column', '.right-column');
+    orbit.ClickMenuHandler();
 
     // 自適應網頁使用，當網頁載入時，如果視窗寬度小於769，就執行orbit.nav.setDropdown函數
     if ($(window).width() < 769) {
@@ -419,7 +421,7 @@
       orbit.MobileMenu();
       $('.mobile-menu').append($('.modules-menu'));
       $('.header-buttom').appendTo($('.modules-menu'));
-      orbit.ClickMenuHandler();
+
     }
 
     // 自適應網頁使用，當使用者改變瀏覽器寬度時呼叫orbit.nav.setDropdown函數
@@ -665,22 +667,18 @@ extendPanelWidget();
     //公告類別顏色
     $(".w-annc .w-annc__category-wrap").each(function() {
       var SaveCategory = $(this).find(".w-annc__category").text();
-      // console.log(SaveCategory);
       $(this).addClass(SaveCategory);
     })
     $(".w-annc__item ").each(function() {
       var SaveCategory2 = $(this).find(".w-annc__category").text();
-      // console.log(SaveCategory);
       $(this).addClass(SaveCategory2);
     })
     $(".i-annc__item .i-annc__category-wrap").each(function() {
       var SaveCategory = $(this).find(".i-annc__category").text();
-      // console.log(SaveCategory);
       $(this).addClass(SaveCategory);
     })
     $(".i-annc__item ").each(function() {
       var SaveCategory2 = $(this).find(".i-annc__category").text();
-      // console.log(SaveCategory);
       $(this).addClass(SaveCategory2);
     })
 
@@ -740,6 +738,7 @@ extendPanelWidget();
       headerH();
     $(window).resize(function() {
       if ($(window).width() <769) {
+
          $('.modules-menu-level-0').after($('.header-nav'));
       }else{
         $('.outdropdowns').before($('.header-nav'));
diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index b0603ee..7e9ccf8 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -25,6 +25,7 @@
   outline: 0.3125em auto -webkit-focus-ring-color !important;
 }
 .layout-header {
+  z-index: 2;
   position: relative;
   margin-bottom: 0;
   border: none;
@@ -97,7 +98,6 @@
     //   flex-flow: row-reverse;
     // }
     .navbar-brand {
-      margin: 0.5em 0;
       line-height: 2.125em;
       color: $theme-color-main;
       font-family: $main-font;
@@ -107,7 +107,6 @@
       @media (min-width: $screen-sm) {
         margin:0;
         line-height: 3.75em;
-        font-size: 1.5em;
         h1{
           margin-top: 1em;
           font-size: 1.2em;
@@ -151,7 +150,7 @@
           height: 50px !important;
         }
         @media(max-width: 820px)and(min-width:$screen-xs ){
-          height: 60px!important;
+          height: 50px!important;
         }
       }
     }
@@ -159,8 +158,9 @@
 }
 
 .navbar-toggle {
-  padding: 0.875em 0.625em;
   margin-top: 1em;
+  position: absolute;
+  right: 0;
   // border-radius: 0.125em;
   // border-width: 0.125em;
   // border-color: lighten($theme-color-main, 30%);
diff --git a/assets/stylesheets/template/layout/slide.scss b/assets/stylesheets/template/layout/slide.scss
index 0f80764..7abb8c5 100644
--- a/assets/stylesheets/template/layout/slide.scss
+++ b/assets/stylesheets/template/layout/slide.scss
@@ -5,7 +5,7 @@
 .layout-slide {
   position: relative;
   overflow: hidden;
-        z-index: 1;
+  z-index: 0;
   .w-ad-banner {
     margin: auto;
   }
diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss
index b2bd0c3..84a2ec7 100644
--- a/assets/stylesheets/template/modules/ad_banner.scss
+++ b/assets/stylesheets/template/modules/ad_banner.scss
@@ -219,6 +219,7 @@ ul.button-mid{
     position: relative;
     background: none;
     color: #fff;
+    z-index: 100;
     // text-shadow: 1px 1px 1px #0000008c;
     @media screen and (min-width:$screen-xs) and (max-width:1025px){
         padding-top: 30%;
@@ -491,7 +492,6 @@ ul.button-mid{
     p{
       padding: 0 0.2em;
       border-bottom: 3px solid $theme-color-second;
-      box-shadow: 0px 0px 3px 0px #3333334d;
     }
   }
 }
diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss
index a6d5f13..944038b 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -14,6 +14,19 @@
     @extend .i-title;
   }
 }
+.w-annc__status{
+  margin-right: 0.5em;
+  line-height: 1 !important;
+}
+.w-annc__status-wrap{
+  display: flex;
+}
+.i-annc__status-wrap{
+  display: flex;
+}
+.i-annc__th--date{
+  min-width: 6em;
+}
 // .w-annc__th{
 //   border-bottom:0.0625em solid #ddd!important;
 // }
@@ -336,11 +349,6 @@
           background: $theme-color-main;
          }
      }
-     @media(max-width: $screen-xs){
-       margin-left: 0!important;
-       margin-right: 0!important;
-       width: 100% !important;
-     }
    }
   .w-annc__item{
     // @media(min-width:  $screen-lg){
@@ -492,8 +500,8 @@
    }
   .w-annc__item{
     @media(max-width: $screen-xs){
-      margin-left: 0 !important;
-      margin-right: 0 !important;
+      // margin-left: 0 !important;
+      // margin-right: 0 !important;
     }
       &:hover{
         -webkit-transform: translateY(-6px);
@@ -746,9 +754,9 @@
        width: 356px!important;
      }
      @media (max-width: $screen-xs) {
-       width: 94vw !important;
-       margin-left: 0 !important;
-       margin-right: 0 !important;
+      width: 93.5vw !important;
+      margin-left: 0 !important;
+      margin-right: 1em !important;
      }
      &:hover{
       -webkit-transition: all .3s ease;
@@ -911,7 +919,7 @@
     background-color:#dfdfdf;
     display: flex;
     align-items: center;
-    padding: 0 1em;
+    padding:0.5em 1em;
   }
   h4,p{
     padding: 0 1em;
@@ -960,8 +968,6 @@
     }
     @media (max-width: 767px) {
       width: 100%!important;
-      margin-left: 0;
-      margin-right: 0;
     }
  }
 }
@@ -1354,9 +1360,9 @@
       width: 356px!important;
     }
     @media (max-width: $screen-xs) {
-      width: 94vw !important;
+      width: 93.5vw !important;
       margin-left: 0 !important;
-      margin-right: 0 !important;
+      margin-right: 1em !important;
     }
  }
  // .cycle-slide{
@@ -1428,7 +1434,7 @@
    white-space: normal;
   }
   .w-annc__entry-title {
-    height: 2.5em;
+    height: 2em;
   }
   .w-annc__img-wrap {
     height: 12.5em;
@@ -1530,6 +1536,9 @@
 
 //widget 19
 .widget-announcement-19 {
+  .w-annc__title{
+    white-space: normal;
+  }
   .cycle-carousel-wrap{
         display: flex;
   }
@@ -1575,7 +1584,7 @@
       margin-left: 0.5em;
       height: 14em;
   @media(min-width:  $screen-lg){
-    width:579px !important;
+    width:582px !important;
   }
   @media(max-width: 1025px)and(min-width: 821px){
     width: 30.5vw !important;
@@ -1584,8 +1593,10 @@
     width: 356px!important;
   }
   @media (max-width: $screen-xs) {
-    width: 90vw!important;
-  }
+    width: 89vw !important;
+    margin-left: 0.5em !important;
+    margin-right: 0.5em !important;
+   }
  }
 
 }
@@ -1747,13 +1758,15 @@
     font-family: $main-font;
     @extend .i-title;
   }
+  .i-annc__status{
+    margin-right: 0.5em;
+  }
   .i-annc__status-wrap {
     span {
       display: inline-block;
       padding: .2em .6em .3em;
 
       &:last-child {
-        margin: 0 0.3125em 0.1875em 0;
         display: inline-block;
       }
     }
@@ -1779,6 +1792,10 @@
     display: flex !important;
     position: relative;
     align-items: center;
+    flex-wrap: wrap;
+    .i-annc__status-wrap{
+      width:100% ;
+    }
     .i-annc__status-wrap,
     .i-annc__postdate-wrap,
     .i-annc__category-wrap {
@@ -1870,7 +1887,6 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 
   .i-annc__status {
     @extend .i-title;
-    display: inline-block;
   }
 }
 
@@ -1901,7 +1917,6 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 
   .i-annc__status {
     @extend .i-title;
-    display: inline-block;
   }
 
 }
@@ -2250,7 +2265,6 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 
   .i-annc__status {
     @extend .i-title;
-    display: inline-block;
   }
 }
 // Index-21
diff --git a/assets/stylesheets/template/modules/calendar.scss b/assets/stylesheets/template/modules/calendar.scss
index af7ff62..2fd71f9 100644
--- a/assets/stylesheets/template/modules/calendar.scss
+++ b/assets/stylesheets/template/modules/calendar.scss
@@ -1,17 +1,7 @@
 @charset "utf-8";
 
 @import "../initial";
-.widget-calendar-2{
- .w-calendar-title{
-    background:$theme-color-second!important;
-  }
-  .day{
-    color:$theme-color-second!important;
-  }
-  .w-calendar-toggle div{
-        background:$theme-color-second!important;
-  }
-}
+
 .w-calendar {
   width: 100%;
   position: relative;
@@ -66,7 +56,10 @@
   }
 }
 #orbit_calendar{
+  position: relative;
+  margin-top: 1em;
   width: 100%!important;
+  z-index: 0;
   table th{
     background-color: #fff;
     color: #333;
@@ -82,22 +75,95 @@
 .fc-daygrid-event-dot{
     display: none!important;
 }
+
 .fc-daygrid-event-harness{
   .mybooking{
-      background-color:#ff7a00 !important;
-      color: #fff !important;
-      border:0!important;
- .fc-event-main{
-      color: #333 !important;
-      }
+        box-shadow: 0 1px 2px 1px #000000;
+      // background-color:#ff7a00 !important;
+      // color: #fff !important;
+      // border:0!important;
+      // .fc-event-time,.fc-event-title-container{
+      //   color: #fff !important;
+      // }
+      // .fc-event-main-frame{
+      //   color: #fff !important;
+      // }
   }
 }
 .fc .fc-daygrid-event{
       margin-top: 4px;
 }
+.fc-timegrid-event-harness{
+  .mybooking{
+        box-shadow: 0 1px 2px 1px #000000;
+      // background-color:#ff7a00 !important;
+      // border:0!important;
+      // .fc-event-main-frame{
+      //   color: #fff !important;
+      // }
+  }
+}
+.fc-timegrid-slot-label-cushion{
+      font-size:small;
+}
+.fc .fc-timegrid-slot-label{
+  border:0;
+}
+.fc .fc-timegrid-slot{
+      height: 0.5em !important;
+}
+.fc-direction-ltr .fc-timegrid-slot-label-frame{
+  text-align:center!important;
+}
+.fc .fc-timegrid-axis-cushion, .fc .fc-timegrid-slot-label-cushion{
+  padding: 0;
+}
+.fc .fc-timegrid-axis-frame{
+  justify-content: center!important;
+}
+// .fc-timeGridWeek-view{
+//   .fc-event-time{
+//     display: none;
+//   }
+// }
+  .fc-v-event .fc-event-main-frame{
+    padding: 5px;
+    color: #fff;
+  }
+  // .fc-timeGridWeek-view{
+  //  .fc-scrollgrid-sync-table{
+  //       display: none;
+  //   }
+  // }
+  // td.fc-timegrid-axis.fc-scrollgrid-shrink{
+  //       display: none;
+  // }
+// .fc .fc-timegrid-axis-frame{
+//     display: none;
+//   }
+  // .fc .fc-timegrid-slot-label{
+  //     display: none;
+  // }
+
+.fc-timegrid-event-harness{
+  position:relative!important;
+  inset: unset !important;
+}
+.fc-timegrid-event-harness > .fc-timegrid-event{
+  position:relative!important;
+  inset: unset !important;
+  width: 100%;
+  border: 0;
+}
+#hire_form label.col-sm-4.control-label{
+  @media(max-width: $screen-xs){
+        padding-left:0.9375em!important;
+  }
+}
 .modal-content{
   box-shadow: 0 24px 38px 3px #00000024, 0 9px 46px 8px #0000001f, 0 11px 15px -7px #00000033;
   border-radius: 8px;
+  behavior: url("/assets/ie_support/PIE2/PIE.htc");
   border: 0;
 }
 .fc .fc-daygrid-day.fc-day-today{
@@ -106,6 +172,8 @@
     color: #fff;
     background-color: #858585;
     border-radius: 0.65em;
+    min-width: 2em;
+    text-align: center;
   }
 }
 .calendar-modal .event_summary{
@@ -120,13 +188,15 @@
 }
 .fc .fc-daygrid-day-number{
       margin-top: 0.3em;
+          color: inherit;
+}
+.fc .fc-col-header-cell-cushion{
+            color: inherit;
 }
 .fc-daygrid-dot-event{
   display:block !important;
 }
 .fc-daygrid-event-harness .fc-daygrid-event{
-    background-color: #d3d3d3;
-    font-size: 1em;
     padding: 5px;
 }
 .fc .fc-daygrid-more-link{
@@ -146,7 +216,7 @@
     @media(max-width: 768px){
       white-space: normal;
       text-align: justify;
-      font-size: xx-small;
+      font-size: small;
       display: unset !important;
       padding: 0 !important;
     }
@@ -168,16 +238,9 @@
   .fc-daygrid-day-number{
         font-size: small;
   }
-    // .form-group{
-    //   .col-sm-4{
-    //     float: left;
-    //     width: 33.33333333%;
-    //   }
-    //   .col-sm-8{
-    //     float: left;
-    //     width: 66.66666667%;
-    //   }
-    // }
+}
+.has_event{
+  background-color: $theme-color-second!important;
 }
 .createbooking{
   cursor: pointer;
@@ -195,92 +258,28 @@
     height: 2em;
     position: relative;
     border-radius: 2em;
+    behavior: url("/assets/ie_support/PIE2/PIE.htc");
     display: block;
     border: 1px solid #fff;
   }
   position: absolute;
   top: 5em;
   right: 103%;
-  // padding-left: 0.65em;
-  // a{
-  //   margin-top: -5.2em;
-  //   margin-left: 5em;
-  //   z-index: 100;
-  //   position: relative;
-  // }
   @media(max-width:820px){
     display: none!important;
   }
 }
-#hire_form{
-  @media(min-width: 821px){
-    min-width: 500px;
-    height:-webkit-fill-available;
-    transform: translateX(100%);
-    -webkit-transition-timing-function: ease;
-    -o-transition-timing-function: ease;
-    transition-timing-function: ease;
-    -webkit-transition-duration: .35s;
-    -o-transition-duration: .35s;
-    transition-duration: .35s;
-    -webkit-transition-property: transform;
-    -o-transition-property: transform;
-    transition-property: transform;
-    position: relative;
-    float: right;
-    display: none;
-    z-index: 999;
-
-    .form-group{
-      margin-bottom: 0.5em;
-    }
+.form-horizontal{
+  @media(min-width:769px){
+    margin: auto;
+    width: 60%;
   }
+}
   .control-label{
     @media(max-width: 820px){
       padding-left:0.9375em!important;
     }
   }
-  // #pick_start_date{
-  //   @media(min-width: 821px){
-  //     margin-left: 0!important;
-  //     margin-top: 1em;
-  //   }
-  // }
-  // #pick_end_date{
-  //   @media(min-width: 821px){
-  //     margin-left: 0!important;
-  //     margin-top: 1em;
-  //   }
-  // }
-
-}
-.hire-ken-click2{
-  padding-top: 4em;
-  top: 0;
-  background: #fff;
-  right: 0;
-  width: 40%;
-  transform: translateX(0%)!important;
-  display:block!important;
-}
-.shadowblock{
-  overflow-y: scroll !important;
-  padding: 0;
-  position: fixed;
-  background: #333333b8;
-  width: 100%;
-  height: -webkit-fill-available;
-  top: 0;
-  z-index: 999;
-  left: 0;
-  #hire_form{
-    @media(min-width: 821px){
-      max-width: 580px;
-      padding-right: 2em;
-      padding-left: 2em;
-    }
-  }
-}
 .fc-popover-header{
   padding: 6px 12px!important;
   .fc-popover-close{
@@ -304,3 +303,169 @@
 .fc .fc-timegrid-slot-minor{
   border-top: 0;
 }
+.fc-view-harness{
+  height: auto!important;
+}
+.fc-timeGridDay-view{
+  position: relative!important;
+  .fc-timegrid-slot{
+    border:0!important;
+  }
+  .fc-timegrid-slot:empty:before{
+    position: absolute;
+  }
+  .fc-scroller-liquid-absolute{
+    position: relative!important;
+    @media(min-width:$screen-xs){
+      overflow: unset !important;
+    }
+
+  }
+}
+.fc-timeGridWeek-view{
+      position: relative!important;
+      .fc-timegrid-slot{
+        border:0!important;
+      }
+      .fc-timegrid-slot:empty:before{
+        position: absolute;
+      }
+  .fc-scroller-liquid-absolute{
+    position: relative!important;
+    @media(min-width:$screen-xs){
+      overflow: unset !important;
+    }
+  }
+.fc-timegrid-slot:empty:before{
+  // @media(max-width: $screen-xs){
+    height: 0.8em;
+    position: relative;
+    display: block;
+  // }
+  }
+}
+.fc-dayGridMonth-view{
+  position: relative!important;
+  .fc-scroller-liquid-absolute{
+  position: relative!important;
+  }
+  .fc-scrollgrid-sync-table{
+        height: 600px!important;
+  }
+}
+.ui-widget-header{
+  background: #000000!important;
+  border-color: #000000!important;
+  color: #fff !important;
+}
+.ui-state-default{
+  background: #fff !important;
+    border: 0 !important;
+    text-align: center !important;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight{
+  border: 0 !important;
+  background: silver !important;
+}
+.ui-widget-header a{
+  color: #fff!important;
+}
+.ui-widget-header .ui-icon{
+  filter: brightness(500%);
+}
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active, a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover, .ui-button.ui-state-active.hover-class{
+  border: 0 !important;
+  background: silver !important;
+  color:#000!important;
+}
+.hidden_timepickerbtn{
+  margin-left:0.5em;
+  @media(max-width:$screen-xs){
+    margin-left: 0;
+    margin-top: 0.5em;
+  }
+
+}
+#confirm_date{
+  background: #000000;
+  border-color: #000000;
+  &:hover{
+    opacity: .8;
+  }
+}
+#cancel_date{
+  background: #000000;
+  border-color: #000000;
+  &:hover{
+    opacity: .8;
+  }
+}
+  #hidden_timepicker{
+    background: #f1f1f1;
+    padding: 1.2em 0 0 0;
+    border-radius: 0.5em;
+
+  }
+    .hidden_timepicker1{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      @media(max-width:$screen-xs){
+        display: grid;
+        padding: 0 1em;
+        justify-content: flex-start;
+      }
+    }
+    .property_title{
+      font-size: 1.2em;
+      font-weight: bold;
+    }
+    .modal-header{
+      .close{
+        font-size: 2em;
+        position: absolute;
+        right: 0.5em;
+      }
+    }
+@media(max-width: $screen-xs){
+/*  .fc-theme-standard td, .fc-theme-standard th{
+    border:0!important;
+  }*/
+  .fc-timeGridWeek-view{
+   .fc-scrollgrid-sync-table{
+        display:none!important;
+    }
+  }
+  .fc .fc-timegrid-axis-frame{
+    display: none!important;
+  }
+  .fc .fc-timegrid-slot-label{
+      display:none!important;
+  }
+}
+#property-selector{
+    @media(max-width:$screen-xs){
+      .fc .fc-daygrid-body-natural .fc-daygrid-day-events{
+        display: none!important;
+      }
+    .fc .fc-timegrid .fc-daygrid-body{
+      display: none!important;
+    }
+    .fc-daygrid-day-events{
+      display: none!important;
+    }
+    td.fc-timegrid-axis.fc-scrollgrid-shrink{
+      display: none;
+    }
+  }
+}
+.fc-daygrid-day-bottom{
+  a{
+      color:$theme-color-main;
+  }
+}
+.fc-daygrid-event-harness{
+  a{
+      color:$theme-color-main;
+  }
+}
diff --git a/assets/stylesheets/template/modules/event_news.scss b/assets/stylesheets/template/modules/event_news.scss
index 3442224..c7c91d4 100644
--- a/assets/stylesheets/template/modules/event_news.scss
+++ b/assets/stylesheets/template/modules/event_news.scss
@@ -174,9 +174,9 @@
        width: 356px!important;
      }
      @media (max-width: $screen-xs) {
-       width: 94vw !important;
-       margin-left: 0 !important;
-       margin-right: 0 !important;
+      width: 93.5vw !important;
+      margin-left: 0 !important;
+      margin-right: 1em !important;
      }
      &:hover{
       -webkit-transition: all .3s ease;
diff --git a/assets/stylesheets/template/modules/faq.scss b/assets/stylesheets/template/modules/faq.scss
index 1b2ad87..0fd354a 100644
--- a/assets/stylesheets/template/modules/faq.scss
+++ b/assets/stylesheets/template/modules/faq.scss
@@ -51,32 +51,64 @@
       }
     }
   }
-  
+
   &.index2 {
+    .index-content-title-wrap{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+    .fa-chevron-right{
+      background-color: transparent;
+      width: 30px;
+      min-width: 30px;
+      height: 30px;
+      border-radius: 50%;
+      text-align: center;
+      line-height: 30px;
+      transition: 0.4s;
+    }
+    .rotate{
+      background-color: $theme-color-second;
+      color: #fff;
+      transform: rotate(90deg);
+    }
     .index-content {
-      margin: 1em 0;
-      border: 1px solid #ccc;
+      max-width: 900px;
+      margin: 0 auto 0.5em auto;
      & h4 {
       @extend .transition;
       color: #333;
-      background-color: #f5f5f5;
+      background-color: #fff;
       border-color: #ddd;
-      padding: 0.625em 0.9375em;
-      font-size: 1em;
+      padding:2rem 3rem;
+      font-size: 1.2em;
       font-family: $main-font;
       margin: 0;
-   
+      @media(max-width:$screen-xs){
+            padding: 2rem 1em;
+      }
       &:hover {
         background: darken($color: #f5f5f5, $amount: 10);
+        a{
+          color: $theme-color-second;
+        }
         .post { display: block; }
       }
      }
      .post {
-      padding: 1em;
+       @media(max-width:$screen-xs){
+        padding: 1em;
+       }
+       @media(min-width:$screen-xs){
+        padding: 1rem 4em;
+       }
       display: none;
-      background: #fff;
      }
     }
 
   }
-}
\ No newline at end of file
+}
+.index-content{
+  list-style: none;
+}
diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss
index 1907ba0..d24e6ab 100644
--- a/assets/stylesheets/template/modules/menu.scss
+++ b/assets/stylesheets/template/modules/menu.scss
@@ -188,21 +188,21 @@
   .modules-menu-level-0 {
       width: 100%;
       padding: 0;
-      // @media (min-width:769px)and(max-width: 1025px){
-      //   display: flex;
-      //   flex-wrap: wrap;
-      //   justify-content: flex-end;
-      //   padding: 0;
-      //   width: 100%;
-      // }
-    @media (min-width:769px) {
+      @media (min-width:769px)and(max-width: 1024px){
+        display: flex;
+        flex-wrap: wrap;
+        justify-content:space-between;
+        padding: 0;
+        width: 100%;
+      }
+    @media (min-width:1025px) {
       margin: 0;
       padding:0.5em 0 0;
       list-style: none;
       display: flex;
       flex-wrap: wrap;
       justify-content: flex-end;
-      width: 70%;
+      width: 65%;
       }
     .has-dropdown.level-1.active {
       .modules-menu-level-1 {
diff --git a/modules/announcement/annc_index20.html.erb b/modules/announcement/annc_index20.html.erb
index 590bae5..26d1d38 100644
--- a/modules/announcement/annc_index20.html.erb
+++ b/modules/announcement/annc_index20.html.erb
@@ -24,6 +24,12 @@
     </li>
 </div>
 {{pagination_goes_here}}
+<style>
+.i-annc__postdate{
+  display:flex;
+}
+
+</style>
 <script>
   function transdate(){
     var n=document.getElementsByClassName('i-annc__postdate').length;
@@ -94,4 +100,4 @@
     };
   });
 
-</script>
+</script>
\ No newline at end of file
diff --git a/modules/announcement/annc_index21.html.erb b/modules/announcement/annc_index21.html.erb
index 62a4c5b..2a45524 100644
--- a/modules/announcement/annc_index21.html.erb
+++ b/modules/announcement/annc_index21.html.erb
@@ -31,7 +31,7 @@ function postdate() {
   var date = $('.i-annc__postdate');
 
   for (let i=0; i<len; i++) {
-    newDate = date[i].innerText.slice(9,10)
+    newDate = date[i].innerText.slice(8,10)
     newYear = date[i].innerText.slice(0,7 )
     date[i].innerHTML= '';
     date[i].append(newYear)
@@ -44,4 +44,4 @@ function postdate() {
 }
 
 postdate();
-</script>
+</script>
\ No newline at end of file
diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb
index 81c0099..1fce32e 100644
--- a/modules/announcement/show.html.erb
+++ b/modules/announcement/show.html.erb
@@ -11,6 +11,12 @@
   .s-annc__sub-img.pull-left {
     margin-right: 2em;
   }
+  .show-announcement{
+    max-width: 800px;
+    margin: auto;
+    z-index: 1;
+    position: relative;
+  }
 </style>
 <article class="s-annc show-announcement">
   <h1 class="s-annc__show-title">{{title}}</h1>
diff --git a/modules/faq/faq_index2.html.erb b/modules/faq/faq_index2.html.erb
index c1f456c..8a8bf2e 100644
--- a/modules/faq/faq_index2.html.erb
+++ b/modules/faq/faq_index2.html.erb
@@ -9,6 +9,7 @@
         <span data-list="statuses" data-level="1">
           <span class="label status {{status-class}}">{{status}}</span>
         </span>
+        <i class="fa-solid fa-chevron-right" style="float:right;"></i>
       </h4>
       <section class="post">
       <p>{{answer}}</p>
@@ -22,15 +23,19 @@
 <script>
 $('.index-faqs.index2 .index-content .index-content-title-wrap').click(function(){
   $('section.post').slideUp(200);
+
   $(this).removeClass('open');
   if($("+section",this).css("display")=="none"){
       $("+section",this).slideDown(300);
       $(this).addClass("open");
+
   }
   if( $('.index-content-title-wrap').hasClass('open') ) {
-    $(".index-content-title-wrap").attr("aria-expanded","true");
+      $(".open>.fa-chevron-right").addClass("rotate");
+     $(".index-content-title-wrap").attr("aria-expanded","true");
   }
   else {
+    $(".fa-chevron-right").removeClass("rotate");
     $(".index-content-title-wrap").attr("aria-expanded","false");
   }
 })
diff --git a/modules/property_hire/index_calendar.html.erb b/modules/property_hire/index_calendar.html.erb
new file mode 100644
index 0000000..1d79562
--- /dev/null
+++ b/modules/property_hire/index_calendar.html.erb
@@ -0,0 +1,66 @@
+<select name="property-selector" id="property-selector" data-list="filterprops" data-level="0">
+	<option value="{{id}}&reserve=false">{{title}}</option>
+</select>
+<div id="orbit_calendar" class="col-lg-0">
+  <div id="sec1">
+    <div class="btn-toolbar" id="navigation">
+      <div id="calendar-nav">
+        <div class="btn-group">
+          <button class="btn btn-default btn-sm" id="today_btn">{{today}}</button>
+        </div>
+      </div>
+    </div>
+    <div class="form-inline" id="range_selection"></div>
+  </div>
+  <div id='sec3' class="btn-toolbar">
+    <div class="btn-group calendar_mode">
+      <button class="btn btn-default mode_switch btn-sm" data-mode="timeGridDay" >{{day}}</button>
+      <button class="btn btn-default mode_switch btn-sm" data-mode="timeGridWeek" >{{week}}</button>
+      <button class="btn btn-default active mode_switch btn-sm" data-mode="dayGridMonth" >{{month}}</button>
+    </div>
+    <button id="refresh_btn" class="btn btn-default btn-sm">
+      <i class="icons-cycle"></i>
+    </button>
+  </div>
+  <div class="pull-right">
+    <button class="btn btn-default btn-sm" id="prev_month_btn">
+      <i class="icon-chevron-left"></i>
+    </button>
+    <button class="btn btn-default btn-sm" id="next_month_btn">
+      <i class="icon-chevron-right"></i>
+    </button>
+  </div>
+  <div class="clearfix"></div>
+  <div id="view_holder">
+    <h3 id="current_title" class="current_day_title"></h3>
+    <div id="calendar"></div>
+    <div id="calendar_agenda"></div>
+  </div>
+<div id="calendar-loading"></div>
+
+<table class="table table-striped">
+	<thead>
+		<tr data-list="headers" data-level="0">
+			<th>{{column}}</th>
+		</tr>
+	</thead>
+	<tbody data-list="properties" data-level="0">
+		<tr>
+			<td><a href="{{url_to_show}}">{{title}}</a></td>
+			<td><img width="150" src="{{image-thumb}}" alt="property image"></td>
+			<td>{{location}}</td>
+			<td data-list="actions" data-level="1">
+				<a href="{{link}}" class="btn {{btn-class}}">{{text}}</a>
+			</td>
+		</tr>
+	</tbody>
+</table>
+{{pagination_goes_here}}
+
+<script type="text/javascript">
+	var calendar = new Calendar("#calendar", "{{first_property_id}}",{},"",false, "{{language}}");
+	$("#property-selector").on("change",function () {
+		calendar = new Calendar("#calendar", $(this).val(),{},"",false, "{{language}}");
+	})
+	$("#property-selector").prop('selectedIndex', 0);
+</script>
\ No newline at end of file
diff --git a/modules/property_hire/info.json b/modules/property_hire/info.json
index f338727..6873a59 100644
--- a/modules/property_hire/info.json
+++ b/modules/property_hire/info.json
@@ -1,5 +1,13 @@
 {
     "frontend": [
+      {
+          "filename" : "index_calendar",
+          "name" : {
+              "zh_tw" : "0. 有日曆列表",
+              "en" : "0.calendar List"
+              },
+          "thumbnail" : "thumb.png"
+      },
         {
             "filename" : "index",
             "name" : {
@@ -35,4 +43,4 @@
             "thumbnail" : "thumb.png"
         }
     ]
-}
\ No newline at end of file
+}