diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index efb1e89..df0dc01 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -3188,7 +3188,7 @@ $(document).ready(function() {
      * 核心無障礙狀態刷新函式
      */
     function refreshCycleA11y($el) {
-      var $items = $el.find('.w-annc__item, .widget-link__item, [class*="cycle-slide"]');
+      var $items = $el.find('.w-annc__item, .widget-link__item, [class*="cycle-slide"],.widget-pic ');
 
       $items.each(function() {
         var $slide = $(this);
diff --git a/assets/stylesheets/template/modules/gallery.scss b/assets/stylesheets/template/modules/gallery.scss
index 3686e52..d07c5c9 100644
--- a/assets/stylesheets/template/modules/gallery.scss
+++ b/assets/stylesheets/template/modules/gallery.scss
@@ -1,9 +1,6 @@
 @charset "utf-8";
 
 @import "../initial";
-.gallery.card-group .card.card-flip.h-100{
-  height: auto!important;
-}
 .album-name{
   min-height: 1em;
   display: block;
@@ -33,6 +30,7 @@
   padding: 0;
   .img-thumbnail{
     width: 100%;
+    padding: 0;
   }
   &:hover{
     img{
@@ -45,6 +43,9 @@
     }
   }
 }
+.gallery.card-group .card.card-flip.h-100{
+  height: auto !important;
+}
 // Gallery MODULES
 .widget-gallery {
   .widget-title {
@@ -566,6 +567,23 @@
       }
     }
   }
+  &.index8{
+    .index-content-inner{
+        background-color: rgba($theme-color-second, 0.1);
+        margin-bottom: 1em;
+        border-radius: 1em;
+    }
+    h4.index-content-title {
+      padding: 0 1em;
+    }
+    .index-content-inner img{
+      padding: 0;
+      border: 0;
+    }
+    .index-part{
+      padding: 1em 0;
+    }
+  }
 }
 
 .show-gallery {
diff --git a/modules/gallery/_gallery_widget0.html.erb b/modules/gallery/_gallery_widget0.html.erb
index 30083b0..1b5947e 100644
--- a/modules/gallery/_gallery_widget0.html.erb
+++ b/modules/gallery/_gallery_widget0.html.erb
@@ -22,9 +22,9 @@
           src="{{thumb-src}}"
           alt="{{alt_title}}"
         >
+        <span>{{link_text}}</span>
       </a>
       <div style="clear: both;"></div>
-      <a href="{{link_to_show}}" title="{{album-name}}">{{link_text}}</a>
     </div>
   </div>
 </div>
diff --git a/modules/gallery/_gallery_widget1.5.html.erb b/modules/gallery/_gallery_widget1.5.html.erb
index 30083b0..1b5947e 100644
--- a/modules/gallery/_gallery_widget1.5.html.erb
+++ b/modules/gallery/_gallery_widget1.5.html.erb
@@ -22,9 +22,9 @@
           src="{{thumb-src}}"
           alt="{{alt_title}}"
         >
+        <span>{{link_text}}</span>
       </a>
       <div style="clear: both;"></div>
-      <a href="{{link_to_show}}" title="{{album-name}}">{{link_text}}</a>
     </div>
   </div>
 </div>
diff --git a/modules/gallery/_gallery_widget1.html.erb b/modules/gallery/_gallery_widget1.html.erb
index 4a222ec..806cb1a 100644
--- a/modules/gallery/_gallery_widget1.html.erb
+++ b/modules/gallery/_gallery_widget1.html.erb
@@ -21,9 +21,10 @@
           src="{{thumb-src}}"
           alt="{{alt_title}}"
         >
+        <span>{{link_text}}</span>
       </a>
       <div style="clear: both;"></div>
-      <a href="{{link_to_show}}" title="{{album-name}}">{{link_text}}</a>
+      
     </div>
   </div>
 </div>
diff --git a/modules/gallery/_gallery_widget2.html.erb b/modules/gallery/_gallery_widget2.html.erb
index a799bdc..9f7b77f 100644
--- a/modules/gallery/_gallery_widget2.html.erb
+++ b/modules/gallery/_gallery_widget2.html.erb
@@ -13,10 +13,11 @@
           alt="{{alt_title}}"
         >
       </a>
-      <a href="{{link_to_show}}" title="{{album-name}}">
+      <span>
         <div class="mask_title">{{image_description}}</div>
+        <span class="album-name" >{{link_text}}</span>
       </a>
-      <a class="album-name" href="{{link_to_show}}" title="{{album-name}}">{{link_text}}</a>
+
     </div>
   </div>
 </div>
diff --git a/modules/gallery/_gallery_widget3.html.erb b/modules/gallery/_gallery_widget3.html.erb
index f6851ee..301ffd3 100644
--- a/modules/gallery/_gallery_widget3.html.erb
+++ b/modules/gallery/_gallery_widget3.html.erb
@@ -12,10 +12,6 @@
             <div class="mask_title">{{image_description}}</div>
           </div>
         </div>
-        <div class="mask">
-          <div class="circle_box"><img src="/assets/circle_icon.png" alt="">
-          </div>
-        </div>
         <img
           srcset="
           {{thumb-large-src}} 1024w,
diff --git a/modules/gallery/_gallery_widget6.html.erb b/modules/gallery/_gallery_widget6.html.erb
index 2e71ba0..8b3367a 100644
--- a/modules/gallery/_gallery_widget6.html.erb
+++ b/modules/gallery/_gallery_widget6.html.erb
@@ -21,9 +21,10 @@
           src="{{thumb-src}}"
           alt="{{alt_title}}"
         >
+        <span>{{link_text}}</span>
       </a>
       <div style="clear: both;"></div>
-      <a href="{{link_to_show}}" title="{{album-name}}">{{link_text}}</a>
+
     </div>
   </div>
 </div>
diff --git a/modules/gallery/_gallery_widget7.html.erb b/modules/gallery/_gallery_widget7.html.erb
index 89c8d93..59015a4 100644
--- a/modules/gallery/_gallery_widget7.html.erb
+++ b/modules/gallery/_gallery_widget7.html.erb
@@ -28,12 +28,11 @@
           src="{{thumb-src}}"
           alt="{{alt_title}}"
         >
+        <div class="mask_title">{{image_description}}</div>
+        <span>{{link_text}}</span>
       </a>
       <div style="clear: both;"></div>
-      <a href="{{link_to_show}}" title="{{album-name}}">
-        <div class="mask_title">{{image_description}}</div>
-      </a>
-      <a href="{{link_to_show}}" title="{{album-name}}">{{link_text}}</a>
+
     </div>
 
 
diff --git a/modules/gallery/_gallery_widget9.html.erb b/modules/gallery/_gallery_widget9.html.erb
index c0dd22a..6952de2 100644
--- a/modules/gallery/_gallery_widget9.html.erb
+++ b/modules/gallery/_gallery_widget9.html.erb
@@ -12,11 +12,9 @@
           src="{{thumb-src}}"
           alt="{{alt_title}}"
         >
-      </a>
-      <a href="{{link_to_show}}" title="{{album-name}}">
         <div class="mask_title">{{image_description}}</div>
+        <div class="album-name">{{link_text}}</div>
       </a>
-      <a class="album-name" href="{{link_to_show}}" title="{{album-name}}">{{link_text}}</a>
     </div>
   </div>
 </div>
diff --git a/modules/gallery/gallery_index2.html.erb b/modules/gallery/gallery_index2.html.erb
index 4775f73..2ee7848 100644
--- a/modules/gallery/gallery_index2.html.erb
+++ b/modules/gallery/gallery_index2.html.erb
@@ -5,18 +5,15 @@
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content">
       <div class="index-content-inner clearfix row">
-       <a href="{{link_to_show}}" title="{{album-name}}">
+       <a href="{{link_to_show}}">
         <div class="index-pic col-sm-2">
           <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
         </div>
-        </a>
         <div class="index-part col-sm-10">
-          <h4 class="index-content-title">
-           <a href="{{link_to_show}}" title="{{album-name}}">{{album-name}}</a>
-          </h4>
+          <h4 class="index-content-title">{{album-name}}</h4>
           <div class="index-img-description">{{album-description}}</div>
         </div>
-
+        </a>
       </div>
     </div>
   </div>
diff --git a/modules/gallery/gallery_index3.html.erb b/modules/gallery/gallery_index3.html.erb
index 763dea4..cbd7ed4 100644
--- a/modules/gallery/gallery_index3.html.erb
+++ b/modules/gallery/gallery_index3.html.erb
@@ -4,19 +4,16 @@
   </h3>
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content col-sm-3">
-      <a href="{{link_to_show}}" title="{{album-name}}">
+      <a href="{{link_to_show}}">
         <div class="index-content-inner">
           <div class="index-pic">
-            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
+          </div>
+          <div class="index-part">
+              <h4 class="index-content-title">{{album-name}}</h4>
           </div>
-      </a>
-        <div class="index-part">
-            <h4 class="index-content-title">
-              <a href="{{link_to_show}}" title="{{album-name}}">{{album-name}}</a>
-            </h4>
         </div>
-    </div>
-
+      </a>
     </div>
   </div>
 </div>
diff --git a/modules/gallery/gallery_index4.html.erb b/modules/gallery/gallery_index4.html.erb
index 1fd261b..565d191 100644
--- a/modules/gallery/gallery_index4.html.erb
+++ b/modules/gallery/gallery_index4.html.erb
@@ -9,13 +9,10 @@
           <div class="index-pic col-xs-5 col-sm-2">
             <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
           </div>
+          <div class="index-part col-xs-7 col-sm-10">
+              <h4 class="index-content-title">{{album-name}}</h4>
+          </div>
         </a>
-        <div class="index-part col-xs-7 col-sm-10">
-            <h4 class="index-content-title">
-              <a href="{{link_to_show}}" title="{{album-name}}">{{album-name}}</a>
-            </h4>
-        </div>
-
       </div>
     </div>
   </div>
diff --git a/modules/gallery/gallery_index5.html.erb b/modules/gallery/gallery_index5.html.erb
index 80626db..142559c 100644
--- a/modules/gallery/gallery_index5.html.erb
+++ b/modules/gallery/gallery_index5.html.erb
@@ -5,24 +5,29 @@
   <link rel="stylesheet" type="text/css" href="/assets/gallery_card.css">
   <div class="row" data-level="0" data-list="albums">
     <div class="card card-flip h-100">
-    <a href="{{link_to_show}}" title="{{album-name}}">
+    <a href="{{link_to_show}}">
         <div class="card-front">
           <div class="card-body" style="padding:0;">
-            <img src="{{thumb-src}}"alt="{{alt_title}}">
+            <img src="{{thumb-src}}" alt="{{album-name}}">
             <div class="card-footer">
               <h3 class="card-title">{{album-name}}</h3>
             </div>
           </div>
         </div>
-
       <div class="card-back">
         <div class="card-body" style="background-color: {{album_color}};color: {{album_card_text_color}};">
           <h3 class="card-title">{{album-name}}</h3>
         </div>
       </div>
-    
     </div>
     </a>
   </div>
 </div>
 {{pagination_goes_here}}
+<style>
+.h-100{
+  height: auto !important;
+      padding: 0;
+}
+
+</style>
\ No newline at end of file
diff --git a/modules/gallery/gallery_index6.html.erb b/modules/gallery/gallery_index6.html.erb
index b304765..a435d02 100644
--- a/modules/gallery/gallery_index6.html.erb
+++ b/modules/gallery/gallery_index6.html.erb
@@ -7,17 +7,14 @@
 
         <div class="index-content-inner">
           <a href="{{link_to_show}}" title="{{album-name}}">
-          <div class="index-pic">
-            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
-          </div>
+            <div class="index-pic">
+              <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+            </div>
+            <div class="index-part">
+              <h4 class="index-content-title">{{album-name}}</h4>
+            </div>
           </a>
-          <section class="index-part">
-            <h4 class="index-content-title">
-              <a href="{{link_to_show}}" title="{{album-name}}">{{album-name}}</a>
-            </h4>
-          </section>
         </div>
-
     </div>
   </div>
 </div>
diff --git a/modules/gallery/gallery_index7.html.erb b/modules/gallery/gallery_index7.html.erb
index ef580f5..d632572 100644
--- a/modules/gallery/gallery_index7.html.erb
+++ b/modules/gallery/gallery_index7.html.erb
@@ -9,15 +9,12 @@
         <div class="index-pic">
           <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
         </div>
-        </a>
         <div class="index-part">
-          <h4 class="index-content-title">
-            <a href="{{link_to_show}}" title="{{album-name}}">{{album-name}}</a>
-          </h4>
+          <h4 class="index-content-title">{{album-name}}</h4>
           <div class="index-img-description">{{album-description}}</div>
         </div>
+        </a>
       </div>
-
     </div>
   </div>
 </div>
diff --git a/modules/gallery/gallery_index8.html.erb b/modules/gallery/gallery_index8.html.erb
index 051245d..0d95d3a 100644
--- a/modules/gallery/gallery_index8.html.erb
+++ b/modules/gallery/gallery_index8.html.erb
@@ -9,15 +9,11 @@
           <div class="index-pic">
             <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
           </div>
-      </a>
         <div class="index-part">
-            <h4 class="index-content-title">
-              <a href="{{link_to_show}}" title="{{album-name}}">{{album-name}}</a>
-            </h4>
-            
+            <h4 class="index-content-title">{{album-name}}</h4>
         </div>
+      </a>
     </div>
-
     </div>
   </div>
 </div>
diff --git a/modules/gallery/show.html.erb b/modules/gallery/show.html.erb
index 62d89b0..c1e044c 100644
--- a/modules/gallery/show.html.erb
+++ b/modules/gallery/show.html.erb
@@ -26,4 +26,18 @@
     width:100%;
   }
 }
-</style>
\ No newline at end of file
+</style>
+<script>
+  setTimeout(function() {
+    var albumTitle = $('.show-title span').text().trim();
+
+    $('.show-content').each(function(index) {
+      var $img = $(this).find('img');
+      if ($img.attr('alt') === 'gallery image') {
+        $img.attr('alt', albumTitle + (index + 1));
+      }
+    });
+    $('.show-pic a').removeAttr('title');
+  }, 500);
+
+</script>
\ No newline at end of file