diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb
index c18fa06..81900bf 100644
--- a/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -131,7 +131,9 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
                     var banner_wrap = $(iframe).parents('.w-ba-banner__wrap').eq(0);
                     banner_wrap.height(height).css({"padding-bottom":"","padding-top":""});
                     banner_wrap.find(".cycle-carousel-wrap").css("top","3em");
-                    delete (event.target.B || event.target.H).onStateChange;
+                    try{
+                      delete (event.target.B || event.target.H || event.target.I).onStateChange;
+                    }catch(e){console.log("{onReady: true, onStateChange: true} missing!")};
                     var onStateChange_idx = event.target.l.i.onStateChange;
                     onStateChange_idx.reverse();
                     var event_size = 3;
@@ -194,7 +196,8 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
     /*
     var height = opts.slides.filter('.active').height() || opts.slides.height();
     banner_wrap.height(height)*/
-    banner_wrap.css("padding-bottom","");
+    if(banner_wrap.find('.cycle-slide-active iframe').length != 0)
+      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');
diff --git a/modules/universal_table/index.html.erb b/modules/universal_table/index.html.erb
new file mode 100644
index 0000000..29164e6
--- /dev/null
+++ b/modules/universal_table/index.html.erb
@@ -0,0 +1,87 @@
+  <style>
+    .universal-dropdown-menu {
+      padding: 15px 18px;
+      white-space: nowrap;
+    }
+    .universal-th-text  {
+      padding: 8px 0 0 0;
+      display: inline;
+      margin-right: 5px;
+      color: #888;
+    }
+    .universal-dropdown {
+      display: inline-block;
+    }
+    a.universal-btn {
+      vertical-align: baseline;
+      color: #fff;
+    }
+    .universal-table-index {
+      border-collapse: collapse;
+      border: 1px solid #eee;
+      table-layout: fixed;
+      word-wrap: break-word;
+    }
+    .universal-table-index h3 {
+      float: left;
+      margin: 0;
+    }
+    .universal-table-index.table td{
+      padding: 15px 18px;
+    }
+    .universal-table-index thead th:last-child .dropdown-menu {
+      left: auto;
+      right: 0;
+    }
+    .universal-th-icon {
+      border: 1px solid #eee;
+      padding: 5px 8px;
+      margin-right: 5px;
+      color: gray;
+      cursor: pointer;
+    }
+    .universal-th-text.no-sort.no-search {
+      position: relative;
+      top: -6px;
+    }
+    .image-preview {
+      width: 120px;
+    }
+  </style>
+  <table class="table table-hover table-striped universal-table-index">
+    <caption>
+      <h3>{{table-name}}</h3>
+      <a href="{{url}}" class="universal-btn btn btn-info pull-right {{reset}}"><i class="fa fa-refresh"></i> Reset</a>
+    </caption>
+    <thead>
+      <tr data-list="head-columns" data-level="0">
+        <th class="col-md-3">
+          <a href="{{sort-url}}" class="{{sort}}"><i class="universal-th-icon fa fa-{{sort-class}}"></i></a>
+          <div class="universal-th-text {{title-class}}">{{title}}</div>
+          <div class="dropdown universal-dropdown {{search}}">
+            <button class="btn btn-sm" id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <i class="fa fa-search"></i>
+              <span class="caret"></span>
+            </button>
+            <div class="dropdown-menu universal-dropdown-menu" aria-labelledby="dLabel">
+              <form class="form-inline universal-form-inline" action="{{url}}" method="get">
+                <div class="form-group">
+                  {{form-field}}
+                  <input type="hidden" value="{{key}}" name="column" >
+                </div>
+                <button class="btn btn-primary" type="submit" class="btn btn-default">Go</button>
+              </form>
+            </div>
+          </div>
+        </th>
+      </tr>
+    </thead>
+    <tbody data-level="0" data-list="rows">
+      <tr data-level="1" data-list="columns">
+        <td>{{text}}</td>
+      </tr>
+    </tbody>
+  </table>
+  <div>{{total_entries}}</div>
+  <div>{{export_button}}</div>
+  {{pagination_goes_here}}
diff --git a/modules/universal_table/info.json b/modules/universal_table/info.json
new file mode 100644
index 0000000..cda3d13
--- /dev/null
+++ b/modules/universal_table/info.json
@@ -0,0 +1,12 @@
+{
+    "frontend": [
+        {
+            "filename" : "index",
+            "name" : {
+                "zh_tw" : "1. 列表",
+                "en" : "1. List"
+                },
+            "thumbnail" : "thumb.png"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/modules/universal_table/show.html.erb b/modules/universal_table/show.html.erb
new file mode 100644
index 0000000..de7dd3c
--- /dev/null
+++ b/modules/universal_table/show.html.erb
@@ -0,0 +1,21 @@
+ <style>
+  .universal-table-show {
+    border: 1px solid #eee;
+    border-collapse: collapse;
+  }
+  .universal-table-show.table td{
+    padding: 15px 18px;
+  }
+  .table-title {
+    border-right: 1px solid #eee;
+  }
+
+ </style>
+ <table class="table table-striped universal-table-show">
+   <tbody data-level="0" data-list="entry">
+     <tr>
+       <td class="table-title">{{title}}</td>
+       <td>{{text}}</td>
+     </tr>
+   </tbody>
+</table>
\ No newline at end of file
diff --git a/modules/universal_table/thumbs/thumb.png b/modules/universal_table/thumbs/thumb.png
new file mode 100644
index 0000000..266af56
Binary files /dev/null and b/modules/universal_table/thumbs/thumb.png differ