diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js
index af39536d8c..1e61c0981a 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.extendedinfopanel.js
@@ -40,7 +40,10 @@ Sonia.repository.ExtendedInfoPanel = Ext.extend(Sonia.repository.InfoPanel,{
   checkoutText: 'Checkout: ',
   
   // TODO i18n
-  repositoryBrowserText: 'RepositoryBrowser',
+  repositoryBrowserText: 'Source',
+  
+  enableRepositoryBrowser: true,
+  enableChangesetViewer: true,
   
   modifyDefaultConfig: function(config){
     var items = config.items;
@@ -56,18 +59,34 @@ Sonia.repository.ExtendedInfoPanel = Ext.extend(Sonia.repository.InfoPanel,{
               this.checkoutTemplate, 
               this.getRepositoryUrlWithUsername()
             )
-    },
-      this.createSpacer(), 
-      this.createChangesetViewerLink(),
-      this.createSpacer(),
-      this.createRepositoryBrowserLink()
-    );
+    },this.createSpacer());
+    
+    var box = {
+      xtype: 'panel',
+      colspan: 2,
+      layout: 'column',
+      items: [
+        this.createChangesetViewerLink(),{
+          xtyle: 'box',
+          html: ', ',
+          width: 8
+        }, this.createRepositoryBrowserLink()
+      ]
+    }
+    
+    items.push(box);
+    
+    if ( this.enableChangesetViewer ){
+      // items.push(this.createChangesetViewerLink());
+    }
+    if ( this.enableRepositoryBrowser ){
+      // items.push(this.createRepositoryBrowserLink());
+    }
   },
   
   createRepositoryBrowserLink: function(){
     return {
       xtype: 'link',
-      colspan: 2,
       text: this.repositoryBrowserText,
       handler: this.openRepositoryBrowser,
       scope: this
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js
index 85663eb1b4..e36a138043 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.infopanel.js
@@ -43,8 +43,8 @@ Sonia.repository.InfoPanel = Ext.extend(Ext.Panel, {
   typeText: 'Type: ',
   contactText: 'Contact: ',
   urlText: 'Url: ',
-  changesetViewerText: 'ChangesetViewer',
-  changesetViewerTitleText: 'ChangesetViewer {0}',
+  changesetViewerText: 'Commits',
+  changesetViewerTitleText: 'Commits {0}',
 
   initComponent: function(){
     
@@ -141,7 +141,6 @@ Sonia.repository.InfoPanel = Ext.extend(Ext.Panel, {
   createChangesetViewerLink: function(){
     return {
       xtype: 'link',
-      colspan: 2,
       text: this.changesetViewerText,
       handler: this.openChangesetViewer,
       scope: this
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
index 849525f8ff..26480d1886 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.repositorybrowser.js
@@ -35,7 +35,7 @@ Sonia.repository.RepositoryBrowser = Ext.extend(Ext.grid.GridPanel, {
   revision: null,
   
   // TODO i18n
-  repositoryBrowserTitleText: 'RepositoryBrowser: {0}',
+  repositoryBrowserTitleText: 'Source: {0}',
   iconFolder: 'resources/images/folder.gif',
   iconDocument: 'resources/images/document.gif',
   templateIcon: '<img src="{0}" alt="{1}" title="{2}" />',