diff --git a/src/IDF/templates/idf/source/mtn/changelog.html b/src/IDF/templates/idf/source/mtn/changelog.html
index fa92f24..bb3dbc5 100644
--- a/src/IDF/templates/idf/source/mtn/changelog.html
+++ b/src/IDF/templates/idf/source/mtn/changelog.html
@@ -2,15 +2,19 @@
 {block context}
 <p><strong>{trans 'Branches:'}</strong><br/>
 {foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br/>
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$branch}{/if}">
+    {if $path}{$path|shorten:25}{else}{$branch|shorten:25}{/if}
+</a></span><br/>
 {/foreach}
 </p>
 {if $tags}
 <p><strong>{trans 'Tags:'}</strong><br/>
 {foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a></span><br/>
+{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
+<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$tag}{/if}">
+    {if $path}{$path|shorten:25}{else}{$tag|shorten:25}{/if}
+</a></span><br/>
 {/foreach}
 </p>
 {/if}
diff --git a/src/IDF/templates/idf/source/mtn/file.html b/src/IDF/templates/idf/source/mtn/file.html
index 77b33d8..a8f4e43 100644
--- a/src/IDF/templates/idf/source/mtn/file.html
+++ b/src/IDF/templates/idf/source/mtn/file.html
@@ -6,7 +6,7 @@
 
 <table class="code" summary=" ">
 {if !$tree_in and !$tags_in}
-{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)} 
+{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}
 <tfoot>
 <tr><th colspan="2">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br/>
 <span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>
@@ -25,19 +25,22 @@
 <p><strong>{trans 'Branches:'}</strong><br/>
 {foreach $branches as $branch => $path}
 {aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br/>
+<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$branch}{/if}">
+    {if $path}{$path|shorten:25}{else}{$branch|shorten:25}{/if}
+</a></span><br/>
 {/foreach}
 </p>
 {if $tags}
 <p><strong>{trans 'Tags:'}</strong><br/>
 {foreach $tags as $tag => $path}
 {aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a></span><br/>
+<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label" title="{if $path}{$path}{else}{$tag}{/if}">
+    {if $path}{$path|shorten:25}{else}{$tag|shorten:25}{/if}
+</a></span><br/>
 {/foreach}
 </p>
 {/if}
 {/block}
-
 {block javascript}
 <script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>
 <script type="text/javascript">prettyPrint();</script>