diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js
index 2cfb8f25..405dab62 100644
--- a/content/treestyletab/config.js
+++ b/content/treestyletab/config.js
@@ -126,13 +126,10 @@ function onSyncGroupBookmarkPrefToUI()
 
 function onChangeTabbarPosition(aOnChange)
 {
-	var pos = document.getElementById('extensions.treestyletab.tabbar.position-radiogroup').value;
-	var invertTab = document.getElementById('extensions.treestyletab.tabbar.invertTab-check');
+	var pos = document.getElementById('extensions.treestyletab.tabbar.position').value;
 	var invertTabContents = document.getElementById('extensions.treestyletab.tabbar.invertTabContents-check');
 	var invertClosebox = document.getElementById('extensions.treestyletab.tabbar.invertClosebox-check');
 
-	invertTab.disabled = pos != 'right';
-//	invertTabContents.disabled = pos != 'right';
 	invertClosebox.setAttribute('label',
 		invertClosebox.getAttribute(
 			(pos == 'right' && invertTabContents.checked) ?
diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 4106643b..94206024 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -72,8 +72,9 @@
 	<vbox>
 
 	<groupbox>
-		<caption label="&config.tabbar.position.caption;"/>
+		<caption label="&config.tabbar.caption;"/>
 		<vbox>
+<!--
 		<hbox>
 		<spacer flex="1"/>
 		<radiogroup id="extensions.treestyletab.tabbar.position-radiogroup"
@@ -112,6 +113,10 @@
 		</radiogroup>
 		<spacer flex="1"/>
 		</hbox>
+-->
+		<checkbox id="extensions.treestyletab.tabbar.invertTab-check"
+			preference="extensions.treestyletab.tabbar.invertTab"
+			label="&config.tabbar.invertTab;"/>
 		<hbox align="center">
 			<checkbox id="extensions.treestyletab.tabbar.invertTabContents-check"
 				preference="extensions.treestyletab.tabbar.invertTabContents"
@@ -516,7 +521,7 @@
 	<vbox>
 
 		<groupbox orient="vertical">
-			<radiogroup orient="vertical"
+			<radiogroup orient="horizontal"
 				id="extensions.treestyletab.tabbar.autoHide.mode-radio"
 				preference="extensions.treestyletab.tabbar.autoHide.mode"
 				onselect="onChangeAutoHideMode()">
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index a60b6a15..8b3611aa 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -6,14 +6,16 @@
 
 <!ENTITY config.tabs.appearance "Darstellung">
 
-<!ENTITY config.tabbar.position.caption "Position der Tableiste">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
+<!--ENTITY config.tabbar.position.caption "Position der Tableiste"-->
 <!ENTITY config.tabbar.position.left    "Links">
 <!ENTITY config.tabbar.position.right   "Rechts">
 <!ENTITY config.tabbar.position.top     "Oben (Firefox Standard)">
 <!ENTITY config.tabbar.position.bottom  "Unten">
 <!ENTITY config.tabbar.invertClosebox.left  "Schließen-Button in jedem Tab links anzeigen">
 <!ENTITY config.tabbar.invertClosebox.right "Schließen-Button in jedem Tab rechts anzeigen">
-<!ENTITY config.tabbar.invertTab            "Tabs von rechts einrücken">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
+<!--ENTITY config.tabbar.invertTab            "Tabs von rechts einrücken"-->
 <!ENTITY config.tabbar.invertTabContents    "Symbol und Text in den Tabs vertauschen">
 <!ENTITY config.enableSubtreeIndent         "Tabs einrücken">
 <!ENTITY config.allowSubtreeCollapseExpand  "Auf- und Einklappen von Zweigen erlauben">
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 56cc3ad9..f271cc84 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -6,14 +6,14 @@
 
 <!ENTITY config.tabs.appearance "Appearance">
 
-<!ENTITY config.tabbar.position.caption "Tab bar position">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
 <!ENTITY config.tabbar.position.left    "Leftside">
 <!ENTITY config.tabbar.position.right   "Rightside">
 <!ENTITY config.tabbar.position.top     "Top (Firefox default)">
 <!ENTITY config.tabbar.position.bottom  "Bottom">
 <!ENTITY config.tabbar.invertClosebox.left  "Show closebox at leftside in each tab">
 <!ENTITY config.tabbar.invertClosebox.right "Show closebox at rightside in each tab">
-<!ENTITY config.tabbar.invertTab            "Invert tab appearance">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
 <!ENTITY config.tabbar.invertTabContents    "Invert tab contents">
 <!ENTITY config.enableSubtreeIndent         "Indent tabs">
 <!ENTITY config.allowSubtreeCollapseExpand  "Allow to collapse/expand tree of tabs">
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 78dd335e..a1bfb3e7 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -6,14 +6,16 @@
 
 <!ENTITY config.tabs.appearance "Apariencia">
 
-<!ENTITY config.tabbar.position.caption "Posición de la barra de pestañas">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
+<!--ENTITY config.tabbar.position.caption "Posición de la barra de pestañas"-->
 <!ENTITY config.tabbar.position.left    "Lado izquierdo">
 <!ENTITY config.tabbar.position.right   "Lado derecho">
 <!ENTITY config.tabbar.position.top     "Encima (Predeterminado en Firefox)">
 <!ENTITY config.tabbar.position.bottom  "Debajo">
 <!ENTITY config.tabbar.invertClosebox.left  "Show closebox at leftside in each tab">
 <!ENTITY config.tabbar.invertClosebox.right "Show closebox at rightside in each tab">
-<!ENTITY config.tabbar.invertTab            "Invertir apariencia de pestaña">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
+<!--ENTITY config.tabbar.invertTab            "Invertir apariencia de pestaña"-->
 <!ENTITY config.tabbar.invertTabContents    "Invert tab contents">
 <!ENTITY config.enableSubtreeIndent         "Añadir margen a las pestañas">
 <!ENTITY config.allowSubtreeCollapseExpand  "Permitir colapsar/expandir los sub-árboles de las pestañas">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 26c1e48f..6a6b08ee 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -6,14 +6,16 @@
 
 <!ENTITY config.tabs.appearance "Aspetto">
 
-<!ENTITY config.tabbar.position.caption "Posiziona barra delle schede">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
+<!--ENTITY config.tabbar.position.caption "Posiziona barra delle schede"-->
 <!ENTITY config.tabbar.position.left    "sul lato sinistro">
 <!ENTITY config.tabbar.position.right   "sul lato destro">
 <!ENTITY config.tabbar.position.top     "in alto (comportamento predefinito di Firefox)">
 <!ENTITY config.tabbar.position.bottom  "in basso">
 <!ENTITY config.tabbar.invertClosebox.left  "Visualizza il pulsante di chiusura alla sinistra di ogni scheda">
 <!ENTITY config.tabbar.invertClosebox.right "Visualizza il pulsante di chiusura alla destra di ogni scheda"> <!-- NUOVA -->
-<!ENTITY config.tabbar.invertTab            "Inverti la visualizzazione delle schede">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
+<!--ENTITY config.tabbar.invertTab            "Inverti la visualizzazione delle schede"-->
 <!ENTITY config.tabbar.invertTabContents    "Inverti la visualizzazione dei controlli di contrazione/espansione dei sottoalberi"> <!-- NUOVA -->
 <!ENTITY config.enableSubtreeIndent         "Indenta sottoschede">
 <!ENTITY config.allowSubtreeCollapseExpand  "Permetti di contrarre/espandere sottoalberi delle schede">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index fa5db32e..eacc8394 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -6,15 +6,15 @@
 
 <!ENTITY config.tabs.appearance "外観">
 
-<!ENTITY config.tabbar.position.caption "タブバーの表示位置">
+<!ENTITY config.tabbar.caption "タブとタブバーの内容">
 <!ENTITY config.tabbar.position.left    "左">
 <!ENTITY config.tabbar.position.right   "右">
 <!ENTITY config.tabbar.position.top     "上（Firefox初期状態）">
 <!ENTITY config.tabbar.position.bottom  "下">
 <!ENTITY config.tabbar.invertClosebox.left  "タブのクローズボックスを左に表示">
 <!ENTITY config.tabbar.invertClosebox.right "タブのクローズボックスを右に表示">
-<!ENTITY config.tabbar.invertTab            "タブの表示を左右反転">
-<!ENTITY config.tabbar.invertTabContents    "タブの内容を左右反転">
+<!ENTITY config.tabbar.invertTab            "ウィンドウ右に置いたタブバーでタブの表示を左右反転する">
+<!ENTITY config.tabbar.invertTabContents    "タブの内容を左右反転する">
 <!ENTITY config.enableSubtreeIndent         "タブをインデント表示する">
 <!ENTITY config.allowSubtreeCollapseExpand  "ツリーを折りたためるようにする">
 <!ENTITY config.tabbar.hideNewTabButton     "「新しいタブを開く」ボタンを表示する">
diff --git a/locale/pl-PL/treestyletab/treestyletab.dtd b/locale/pl-PL/treestyletab/treestyletab.dtd
index dcbf83a4..1c40b26d 100644
--- a/locale/pl-PL/treestyletab/treestyletab.dtd
+++ b/locale/pl-PL/treestyletab/treestyletab.dtd
@@ -6,14 +6,16 @@
 
 <!ENTITY config.tabs.appearance "Wygląd">
 
-<!ENTITY config.tabbar.position.caption "Położenie paska kart">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
+<!--ENTITY config.tabbar.position.caption "Położenie paska kart"-->
 <!ENTITY config.tabbar.position.left    "Po lewej stronie">
 <!ENTITY config.tabbar.position.right   "Po prawej stronie">
 <!ENTITY config.tabbar.position.top     "Na górze (wartość domyślna)">
 <!ENTITY config.tabbar.position.bottom  "Na dole">
 <!ENTITY config.tabbar.invertClosebox.left  "Show closebox at leftside in each tab">
 <!ENTITY config.tabbar.invertClosebox.right "Show closebox at rightside in each tab">
-<!ENTITY config.tabbar.invertTab            "Odwróć wyświetlanie kart">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
+<!--ENTITY config.tabbar.invertTab            "Odwróć wyświetlanie kart"-->
 <!ENTITY config.tabbar.invertTabContents    "Invert tab contents">
 <!ENTITY config.enableSubtreeIndent         "Stosuj wcięcia">
 <!ENTITY config.allowSubtreeCollapseExpand  "Zezwalaj na zwijanie/rozwijanie drzewa kart">
diff --git a/locale/ru-RU/treestyletab/treestyletab.dtd b/locale/ru-RU/treestyletab/treestyletab.dtd
index 2fb8ef58..7aa32a29 100755
--- a/locale/ru-RU/treestyletab/treestyletab.dtd
+++ b/locale/ru-RU/treestyletab/treestyletab.dtd
@@ -6,14 +6,16 @@
 
 <!ENTITY config.tabs.appearance "Внешний вид">
 
-<!ENTITY config.tabbar.position.caption "Расположение панели вкладок">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
+<!--ENTITY config.tabbar.position.caption "Расположение панели вкладок"-->
 <!ENTITY config.tabbar.position.left    "Слева">
 <!ENTITY config.tabbar.position.right   "Справа">
 <!ENTITY config.tabbar.position.top     "Сверху (в Firefox по умолчанию)">
 <!ENTITY config.tabbar.position.bottom  "Снизу">
 <!ENTITY config.tabbar.invertClosebox.left  "Show closebox at leftside in each tab">
 <!ENTITY config.tabbar.invertClosebox.right "Show closebox at rightside in each tab">
-<!ENTITY config.tabbar.invertTab            "Инвертировать вид вкладок">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
+<!--ENTITY config.tabbar.invertTab            "Инвертировать вид вкладок"-->
 <!ENTITY config.tabbar.invertTabContents    "Invert tab contents">
 <!ENTITY config.enableSubtreeIndent         "Отступы вкладок">
 <!ENTITY config.allowSubtreeCollapseExpand  "Разрешить сворачивать/разворачивать поддеревья вкладок">
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index dc1c0dc5..9d71b06a 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -6,7 +6,8 @@
 
 <!ENTITY config.tabs.appearance "外观">
 
-<!ENTITY config.tabbar.position.caption "标签栏位置">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
+<!--ENTITY config.tabbar.position.caption "标签栏位置"-->
 <!ENTITY config.tabbar.position.left    "左侧">
 <!ENTITY config.tabbar.position.right   "右侧">
 <!ENTITY config.tabbar.position.top     "顶部 （Firefox 默认）">
@@ -14,7 +15,8 @@
 <!ENTITY config.tabbar.invertScrollbar  "在最左侧显示滚动条">
 <!ENTITY config.tabbar.invertClosebox.left  "在每个标签左端显示关闭按钮">
 <!ENTITY config.tabbar.invertClosebox.right "在每个标签右端显示关闭按钮">
-<!ENTITY config.tabbar.invertTab            "反转标签外观">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
+<!--ENTITY config.tabbar.invertTab            "反转标签外观"-->
 <!ENTITY config.tabbar.invertTabContents    "反转标签图标和文字位置">
 <!ENTITY config.enableSubtreeIndent         "缩进标签">
 <!ENTITY config.allowSubtreeCollapseExpand  "允许折叠/展开标签子树">
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index 165223c0..b61a4655 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -6,14 +6,16 @@
 
 <!ENTITY config.tabs.appearance "外觀">
 
-<!ENTITY config.tabbar.position.caption "分頁工具列位置">
+<!ENTITY config.tabbar.caption "Tabs and the tab bar">
+<!--ENTITY config.tabbar.position.caption "分頁工具列位置"-->
 <!ENTITY config.tabbar.position.left    "左側">
 <!ENTITY config.tabbar.position.right   "右側">
 <!ENTITY config.tabbar.position.top     "上端（Firefox 預設）">
 <!ENTITY config.tabbar.position.bottom  "下端">
 <!ENTITY config.tabbar.invertClosebox.left  "於各分頁左端顯示關閉鈕">
 <!ENTITY config.tabbar.invertClosebox.right "於各分頁右端顯示關閉鈕">
-<!ENTITY config.tabbar.invertTab            "頁籤外側互調">
+<!ENTITY config.tabbar.invertTab            "Invert tab appearance in the right side tab bar">
+<!--ENTITY config.tabbar.invertTab            "頁籤外側互調"-->
 <!ENTITY config.tabbar.invertTabContents    "頁籤內側互調">
 <!ENTITY config.enableSubtreeIndent         "縮進分頁">
 <!ENTITY config.allowSubtreeCollapseExpand  "允許摺疊 / 展開樹狀子目錄">