diff --git a/modules/archive/archive_index16.html.erb b/modules/archive/archive_index16.html.erb
index 0dd2436..f1133ce 100644
--- a/modules/archive/archive_index16.html.erb
+++ b/modules/archive/archive_index16.html.erb
@@ -1,27 +1,27 @@
 <div class="i-archive index-archive-2 index-archive-16">
-  <h2 class="i-archive-title">
+  <h3 class="i-archive-title">
     <span>{{page-title}}</span>
-  </h2>
+  </h3>
   <div class="panel-group" id="index-archive-group" data-list="categories" data-level="0">
     <div class="panel panel-default default-collapse" data-list="archives" data-level="1">
       <div class="panel-heading" style="padding: 0.625em 0.9375em;">
-        <h3 class="panel-title">
+        <h4 class="panel-title">
+          <div class="date col-sm-2">{{created_at}}</div>
           <i class="fa fa-file-text" aria-hidden="true"></i>
           <a role="button" data-toggle="collapse" data-parent="#index-archive-group" href="#collapse" class="collapsed" style="padding: 0;display: inline-block;">
             {{archive-title}}
             <i class="fa fa-chevron-down" aria-hidden="true"></i>
           </a>
 
-        </h3>
+        </h4>
       </div>
       <div id="collapse" class="panel-collapse collapse {{in_class}}">
         <div class="panel-body">
           <span class="description col-sm-3" style="">{{description}}</span>
           <ul class="i-archive-files-list" data-list="files"  data-level="2">
             <li>
-              <span class="head col-sm-4">{{archive-title}}</span>
               <div class="i-archive-files-itemwrapper " href="{{file-url}}">
-                <span class="label label-primary {{file-type}}">{{file-type}}</span>
+                <a  href="{{file-url}}" class="i-archive-files-item" target="{{target}}" title="{{file-name}}">{{file-name}}<span class="label label-primary {{file-type}}">{{file-type}}</span></a>
               </div>
             </li>
           </ul>
diff --git a/modules/archive/archive_index17.html.erb b/modules/archive/archive_index17.html.erb
index 5e025f3..10c9a70 100644
--- a/modules/archive/archive_index17.html.erb
+++ b/modules/archive/archive_index17.html.erb
@@ -19,17 +19,16 @@
           <div class="div-horizontal i-archive-item-group" data-list="archives" data-level="1">
             <div class="i-archive-wrap">
               <div class="i-archive-item-list">
-                <a href="{{file-url}}" class="i-archive-files-item-a" target="{{target}}">
                 <sapn class="i-archive-item-title">{{archive-title}}</span>
                 <span data-list="statuses" data-level="2">
                   <span class="label status {{status-class}}">{{status}}</span>
                 </span>
-                 <div class="i-archive-files-list" data-list="files"  data-level="2">
-                  <span class="label label-primary {{file-type}}">{{file-type}}</span>
-                 </div>
-                </a>
               </div>
-
+              <div class="i-archive-files-list" data-list="files"  data-level="2">
+                  <a href="{{file-url}}" class="i-archive-files-item-a" target="{{target}}" title="{{file-name}}">
+                  <span class="label label-primary {{file-type}}">{{file-type}}</span>
+                  </a>
+              </div>
               <span class="description" style="">{{description}}</span>
             </div>
           </div>