diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-meta-contrib.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-meta-contrib.xsl
index 87c0cca4b..32d3694e4 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-meta-contrib.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-meta-contrib.xsl
@@ -34,10 +34,14 @@
     <xsl:template match="article-meta/contrib-group | sub-article[@article-type='translation']/*/contrib-group" mode="modal-id"></xsl:template>
     
     <xsl:template match="article-meta/contrib-group | front/contrib-group | front-stub/contrib-group">
+        <!--
+            Remove a apresentação dos autores, deixando apenas o botão "sobre os autores" e adicionando scimago
         <xsl:apply-templates select="contrib[@contrib-type='author']" mode="article-meta-contrib"/>
+        -->
         <xsl:apply-templates select="." mode="about-the-contrib-group-button"/>
+        <xsl:apply-templates select="." mode="scimago-button"/>
     </xsl:template>
-    
+
     <xsl:template match="article-meta/contrib-group | front/contrib-group | front-stub/contrib-group" mode="about-the-contrib-group-button">
         <!--
             Adiciona o botão 'About the contributor', trocando 'author',
@@ -51,6 +55,20 @@
             </a>
         </xsl:if>
     </xsl:template>
+
+    <xsl:template match="article-meta/contrib-group | front/contrib-group | front-stub/contrib-group" mode="scimago-button">
+        <!--
+            Adiciona o botão 'About the contributor', trocando 'author',
+            pelo tipo de contribuição
+        -->
+        <xsl:if test="contrib/*[name()!='name' and name()!='collab']">
+            <xsl:variable name="id"><xsl:apply-templates select="." mode="modal-id"></xsl:apply-templates></xsl:variable>
+            <a href="" class="outlineFadeLink" data-toggle="modal"
+                data-target="#ModalScimago{$id}">
+                SCIMAGO INSTITUTIONS RANKINGS
+            </a>
+        </xsl:if>
+    </xsl:template>
     
     <xsl:template match="article-meta/contrib-group | front/contrib-group | front-stub/contrib-group" mode="about-the-contrib-group-button-text">
         <xsl:variable name="type">
@@ -216,53 +234,23 @@
     <xsl:template match="contrib-id[@contrib-id-type='researchid']" mode="url"
         >http://www.researcherid.com/rid/</xsl:template>
 
-    <xsl:template match="aff//*" mode="insert-separator">
-        <xsl:apply-templates select="*|text()" mode="insert-separator"/>
+    <xsl:template match="aff" mode="insert-separator">
+        <xsl:apply-templates select="institution" mode="insert-separator"/>
+        <xsl:apply-templates select="addr-line/*" mode="insert-separator"/>
+        <xsl:apply-templates select="country" mode="insert-separator"/>
     </xsl:template>
 
-    <xsl:template match="aff//text()" mode="insert-separator">
-        <xsl:value-of select="."/>,&#160; </xsl:template>
+    <xsl:template match="aff/institution" mode="insert-separator"><xsl:if test="position()!=1">, </xsl:if><xsl:value-of select="."/></xsl:template>
 
-    <xsl:template match="aff/*[position()=last()]/text()" mode="insert-separator">
-        <xsl:value-of select="."/>
-    </xsl:template>
-
-    <xsl:template match="aff/text()" mode="insert-separator">
-        <xsl:value-of select="."/>
-    </xsl:template>
+    <xsl:template match="aff/addr-line/* | aff/country" mode="insert-separator">, <xsl:value-of select="."/></xsl:template>
     
     <xsl:template match="aff" mode="display">
-        <xsl:variable name="text"><xsl:apply-templates select="text()"/></xsl:variable>
-        <!--
-        <xsl:comment> $text: <xsl:value-of select="$text"/> </xsl:comment>
-        <xsl:comment> text(): <xsl:apply-templates select="text()"></xsl:apply-templates></xsl:comment>
-        -->
         <xsl:choose>
             <xsl:when test="institution[@content-type='original']">
-                <!--
-                <xsl:comment> aff original </xsl:comment>
-                -->
                 <xsl:apply-templates select="institution[@content-type='original']"/>
             </xsl:when>
-            <xsl:when
-                test="institution[@content-type='orgname'] and contains($text,institution[@content-type='orgname'])">
-                <!--
-                <xsl:comment> $text </xsl:comment>
-                -->
-                <xsl:value-of select="$text"/>
-            </xsl:when>
-            <xsl:when
-                test="*[name()!='label']">
-                <!--
-                <xsl:comment> aff insert separator </xsl:comment>
-                -->
-                <xsl:apply-templates select="*[name()!='label']" mode="insert-separator"/>
-            </xsl:when>
             <xsl:otherwise>
-                <!--
-                <xsl:comment> $text </xsl:comment>
-                -->
-                <xsl:value-of select="$text"/>
+                <xsl:apply-templates select="." mode="insert-separator"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl
index d2773829f..52f94c54f 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl
@@ -19,14 +19,17 @@
                     </xsl:when>
                     <xsl:otherwise>
                         <!-- article -->
-                        <xsl:apply-templates select=".//article-meta//related-article[@related-article-type!='preprint']" mode="article-meta-related-article-box-item"/>
-                        <xsl:apply-templates select="body//related-article[@related-article-type!='preprint']" mode="article-meta-related-article-box-item"/>
+                        <xsl:apply-templates select="front | body | back" mode="article-meta-related-article-box-item"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </div>            
         </xsl:if>
     </xsl:template>
 
+    <xsl:template match="article/front | article/body | article/back" mode="article-meta-related-article-box-item">
+        <xsl:apply-templates select=".//related-article[@related-article-type!='preprint']" mode="article-meta-related-article-box-item"/>
+    </xsl:template>
+
     <xsl:template match="related-article" mode="article-meta-related-article-box-item">
         <xsl:apply-templates select="." mode="article-meta-related-article-message"/>
         <div class="panel-body">
diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl
index baf0c561c..9dd5c2aba 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl
@@ -129,29 +129,35 @@
         <xsl:value-of select="@xlink:href"/>
     </xsl:template>
 
-    <!-- ORIGINAL FILE LOCATION -->
-    <xsl:template match="*" mode="original-file-location">
+    <xsl:template match="table-wrap-group | fig-group" mode="original-file-location">
         <!-- 
             CAMINHO DO ARQUIVO DA IMAGEM ORIGINAL (TAMANHO MAIOR)
         -->
-        <xsl:apply-templates select="*" mode="original-file-location"/>
+        <xsl:apply-templates select="table-wrap | fig" mode="original-file-location"/>
     </xsl:template>
 
-    <xsl:template match="alternatives" mode="original-file-location">
+    <xsl:template match="table-wrap | fig | disp-formula" mode="original-file-location">
         <!-- 
             CAMINHO DO ARQUIVO DA IMAGEM ORIGINAL (TAMANHO MAIOR)
         -->
-        <xsl:apply-templates select="*[@xlink:href!='' and not(@specific-use) and not(@content-type)][1]" mode="original-file-location"/>
+        <xsl:apply-templates select="alternatives | graphic" mode="original-file-location"/>
     </xsl:template>
 
-    <xsl:template match="graphic | inline-graphic" mode="original-file-location">
+    <xsl:template match="alternatives" mode="original-file-location">
         <!-- 
-            CAMINHO DO ARQUIVO DA IMAGEM ORIGINAL (TAMANHO MAIOR | TIFF)
+            CAMINHO DO ARQUIVO DA IMAGEM ORIGINAL (TAMANHO MAIOR)
         -->
-        <xsl:apply-templates select="@xlink:href" mode="fix_extension"/>
+        <xsl:choose>
+            <xsl:when test="*[not(@content-type) and not(@specific-use) and @xlink:href!='']">
+                <xsl:apply-templates select="*[not(@content-type) and not(@specific-use) and @xlink:href!='']" mode="original-file-location"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select="*[@xlink:href!=''][1]" mode="original-file-location"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
-    <xsl:template match="alternatives/graphic | alternatives/inline-graphic" mode="original-file-location">
+    <xsl:template match="graphic | inline-graphic" mode="original-file-location">
         <!-- 
             CAMINHO DO ARQUIVO DA IMAGEM ORIGINAL (TAMANHO MAIOR | TIFF)
         -->
diff --git a/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml b/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml
index 7348c386a..6a85c2536 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml
+++ b/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml
@@ -156,13 +156,15 @@
     </term>
     <term>
         <name>About the authors</name>
-        <name lang="pt">Sobre os autores</name>
-        <name lang="es">Acerca de los autores</name>
+        <name lang="en">Authorship</name>
+        <name lang="pt">Autoria</name>
+        <name lang="es">Autoría</name>
     </term>
     <term>
         <name>About the author</name>
-        <name lang="pt">Sobre o autor</name>
-        <name lang="es">Acerca del autor</name>
+        <name lang="en">Authorship</name>
+        <name lang="pt">Autoria</name>
+        <name lang="es">Autoría</name>
     </term>
     <term>
         <name>About the reviewer</name>
diff --git a/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl b/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl
index a946a2a99..9142daa85 100644
--- a/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl
+++ b/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl
@@ -53,8 +53,38 @@
                 </div>
             </div>
             </div>
+            <xsl:apply-templates select="." mode="modal-scimago">
+                <xsl:with-param name="id" select="$id"/>
+            </xsl:apply-templates>
         </xsl:if>
     </xsl:template>
+
+    <xsl:template match="article-meta | front | front-stub" mode="modal-scimago">
+        <xsl:param name="id"/>
+        <!-- modal com as instituições scimago -->
+        <div class="modal fade ModalDefault ModalTutors" id="ModalScimago{$id}" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&#xd7;</span><span class="sr-only"><xsl:apply-templates select="." mode="interface">
+                            <xsl:with-param name="text">Close</xsl:with-param>
+                        </xsl:apply-templates></span></button>
+                        <h4 class="modal-title">
+                            SCIMAGO INSTITUTIONS RANKINGS
+                        </h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="info">
+                            <xsl:apply-templates select="aff | contrib-group/aff" mode="modal-scimago"/>
+                            <xsl:if test="not(aff) and not(contrib-group/aff) and ../@article-type='translation'">
+                                <xsl:apply-templates select="$article//article-meta/front/aff | $article//article-meta/front/contrib-group/aff" mode="modal-scimago"/>
+                            </xsl:if>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+     </xsl:template>
     
     <xsl:template match="contrib" mode="modal-contrib-type">
         <xsl:if test="@contrib-type!='author'">
@@ -98,8 +128,20 @@
     
     <xsl:template match="aff" mode="modal-contrib">
         <div>
-        <xsl:apply-templates select="." mode="display"/>
-        <xsl:apply-templates select="." mode="hidden-for-scimago"/>
+            <span data-aff-display="{@id}">
+                <xsl:apply-templates select="." mode="display"/>
+            </span>
+            <xsl:apply-templates select="." mode="hidden-for-scimago"/>
+        </div>
+    </xsl:template>
+
+    <xsl:template match="aff" mode="modal-scimago">
+        <div>
+            <span data-aff-display="{@id}">
+                <xsl:apply-templates select="." mode="display"/>
+            </span>
+            <xsl:apply-templates select="." mode="hidden-for-scimago"/>
+        <br/>
         </div>
     </xsl:template>
 
@@ -117,51 +159,44 @@
             <xsl:apply-templates select="." mode="hidden-for-scimago-location"/>
         </span>
         <span data-aff-full="{@id}" hidden="">
-            <xsl:apply-templates select="." mode="hidden-for-scimago-orgname"/>, <xsl:apply-templates select="." mode="hidden-for-scimago-location"/>
+            <xsl:apply-templates select="." mode="display"/>
         </span>
         <a href="" class="scimago-link" data-scimago-link="{@id}"/>
     </xsl:template>
 
     <xsl:template match="aff" mode="hidden-for-scimago-orgname">
-        <xsl:variable name="text"><xsl:apply-templates select="text()"/></xsl:variable>
-        <!--
-        <xsl:comment> $text: <xsl:value-of select="$text"/> </xsl:comment>
-        <xsl:comment> text(): <xsl:apply-templates select="text()"></xsl:apply-templates></xsl:comment>
-        -->
-
         <xsl:choose>
             <xsl:when
                 test="institution[@content-type='orgname']">
-                <!--
-                <xsl:comment> $text </xsl:comment>
-                -->
                 <xsl:value-of select="institution[@content-type='orgname']"/>
             </xsl:when>
             <xsl:when test="institution[@content-type='original']">
-                <!--
-                <xsl:comment> aff original </xsl:comment>
-                -->
                 <xsl:apply-templates select="institution[@content-type='original']"/>
             </xsl:when>
-            <xsl:when
-                test="*[name()!='label']">
-                <!--
-                <xsl:comment> aff insert separator </xsl:comment>
-                -->
-                <xsl:apply-templates select="*[name()!='label']" mode="insert-separator"/>
-            </xsl:when>
             <xsl:otherwise>
-                <!--
-                <xsl:comment> $text </xsl:comment>
-                -->
-                <xsl:value-of select="$text"/>
+                <xsl:apply-templates select="institution" mode="insert-separator"/>
             </xsl:otherwise>
-        </xsl:choose>
-        
+        </xsl:choose>        
     </xsl:template>
 
     <xsl:template match="aff" mode="hidden-for-scimago-location">
-        <xsl:apply-templates select=".//city | .//*[@content-type='city']"/>, <xsl:apply-templates select=".//state | .//*[@content-type='state']"/>, <xsl:apply-templates select=".//country"/>
+        <xsl:choose>
+            <xsl:when test=".//*[@content-type='city'] and .//*[@content-type='state']">
+                <xsl:apply-templates select=".//*[@content-type='city']"/>, <xsl:apply-templates select=".//*[@content-type='state']"/><xsl:if test="country">, </xsl:if><xsl:apply-templates select=".//country"/>
+            </xsl:when>
+            <xsl:when test=".//city and .//state">
+                <xsl:apply-templates select=".//city"/>, <xsl:apply-templates select=".//state"/><xsl:if test="country">, </xsl:if><xsl:apply-templates select=".//country"/>
+            </xsl:when>
+            <xsl:when test=".//*[@content-type='city'] or .//city">
+                <xsl:apply-templates select=".//*[@content-type='city']|.//city"/><xsl:if test="country">, </xsl:if><xsl:apply-templates select=".//country"/>
+            </xsl:when>
+            <xsl:when test=".//*[@content-type='state'] or .//state">
+                <xsl:apply-templates select=".//*[@content-type='state']|.//state"/><xsl:if test="country">, </xsl:if><xsl:apply-templates select=".//country"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select=".//country"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     <xsl:template match="contrib-id" mode="list-item">