diff --git a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveListHandeler.html b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveListHandeler.html
index 35ac23685979bda2c83a6457a6ceacbae530632a..1838144d4d98296f09c8885f95046079532523a7 100755
--- a/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveListHandeler.html
+++ b/src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveListHandeler.html
@@ -165,7 +165,10 @@
                 dataType    : 'json',
                 success     : function (response) {
                     archive.find('.archiveContent').removeClass('hide').find('ul').html('');
-                    Archive.showArchiveContent(archive.find('.archiveContent'), response.digitalResources, response.contents, false);
+                    Archive.showChildrenArchives(archive.find('.archiveContent'), response.contents, false);
+                    Archive.showDigitalResources(archive.find('.archiveContent'), response.digitalResources, false);
+
+                    //Archive.showArchiveContent(archive.find('.archiveContent'), response.digitalResources, response.contents, false);
                     Archive.sortArchives(archive.find('.archiveContent'));
                 },
                 error       : function (response) {
@@ -187,39 +190,52 @@
             })
         },
 
-        showArchiveContent: function(parent, digitalResources, childrenArchives, hidden) {
+        showChildrenArchives: function(archive, childrenArchives, hidden) {
             var count=100
-            template = this.archiveContentTemplate.clone();
             if (childrenArchives) {
                 for(var j=0; j < childrenArchives.length && count>0; j++) {
                     count--;
-                    Archive.mergeRow(parent, childrenArchives[j])
-
-                    Archive.showArchiveContent(template, childrenArchives[j].digitalResources, childrenArchives[j].contents, false);
+                    Archive.mergeArchiveRow(archive, childrenArchives[j])
+                    Archive.showChildrenArchives(archive, childrenArchives[j].contents, hidden);
+                    Archive.showDigitalResources(archive, childrenArchives[j].digitalResources, hidden);
+                    //Archive.showArchiveContent(template, childrenArchives[j].digitalResources, childrenArchives[j].contents, false);
                 }
             }
+        },
 
+        showDigitalResources: function(archive, digitalResources, hidden) {
             if (digitalResources) {
                 for(var i=0; i < digitalResources.length; i++) {
-                    template = this.archiveContentTemplate.clone();
-                    template.children('span')
-                            .addClass('document')
-                            .data('json', digitalResources[i])
-                            .children('span')
-                            .children('i')
-                            .html('&nbsp;&nbsp;&nbsp;')
-                            .siblings('span')
-                            .attr('id', digitalResources[i].resId)
-                            .append($('<i>')).addClass('fa fa-file-o')
-                            .append($('<span>').text(digitalResources[i].fileName));
-                    template.find('small, br, .addChildrenArchive').remove();
-
-                    BootstrapTree.addNode(parent, template, hidden);
+                    resource = Archive.mergeDigitalResourceRow(archive, digitalResources[i], hidden);
+
+                    Archive.showDigitalResources(resource, digitalResources[i].relatedResource, hidden);
                 }
             }
         },
 
-        mergeRow: function(parent, archive) {
+        mergeDigitalResourceRow: function(archive, digitalResource, hidden) {
+            template = this.archiveContentTemplate.clone();
+
+            template.children('span')
+                    .addClass('document')
+                    .data('json', digitalResource)
+                    .children('span')
+                    .children('i')
+                    .data('closed-icon', 'fa-caret-right')
+                    .data('opened-icon', 'fa-caret-down')
+                    .siblings('span')
+                    .data('id', digitalResource.resId)
+                    .append($('<i>').addClass('fa fa-file-o'))
+                    .append($('<span>').text(digitalResource.fileName));
+
+            template.find('small, br, .addChildrenArchive').remove();
+
+            BootstrapTree.addNode(archive, template, hidden);
+
+            return template;
+        },
+
+        mergeArchiveRow: function(parent, archive) {
             template = this.archiveContentTemplate.clone();
             var smalls = template.find('small');