diff --git a/src/webui/www/public/css/dynamicTable.css b/src/webui/www/public/css/dynamicTable.css
index 55a024ab7..270a1dafc 100644
--- a/src/webui/www/public/css/dynamicTable.css
+++ b/src/webui/www/public/css/dynamicTable.css
@@ -8,8 +8,7 @@
 **************************************************************/
 
 #properties #torrentFiles table,
-#properties #trackers table,
-#transferList table {
+#properties #trackers table {
 	border: 1px solid #ccc;
 	width: 100%;
 }
@@ -78,18 +77,50 @@
 	vertical-align: middle;
 }
 
-#trackers th,
-#trackers td,
-#torrentFiles th,
-#torrentFiles td,
-#transferList th,
-#transferList td {
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: nowrap;
-	max-width: 300px;
-}
-
 tr.dynamicTableHeader {
     cursor: pointer;
 }
+
+.dynamicTable {
+    table-layout: fixed;
+    width :1%;
+    padding: 0;
+    border-spacing: 0;
+}
+
+.dynamicTable th {
+    padding: 5px 10px;
+    white-space: nowrap;
+}
+
+.dynamicTable td {
+    padding: 0px 3px;
+    white-space: nowrap;
+}
+
+.dynamicTable thead tr {
+    background-color: #eee;
+}
+
+.dynamicTable th,
+.dynamicTable td {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 300px;
+}
+
+.dynamicTableFixedHeaderDiv {
+    overflow: hidden;
+}
+
+.dynamicTableDiv {
+    overflow: auto;
+}
+
+.dynamicTableDiv thead th {
+    line-height: 0px !important;
+    height: 0px !important;
+    padding-top: 0px !important;
+    padding-bottom: 0px !important;
+}
diff --git a/src/webui/www/public/css/style.css b/src/webui/www/public/css/style.css
index f99d60a54..e101065fb 100644
--- a/src/webui/www/public/css/style.css
+++ b/src/webui/www/public/css/style.css
@@ -389,7 +389,7 @@ td.generalLabel {
     margin-bottom: -3px;
 }
 
-.torrentTable {
+.unselectable {
     -webkit-touch-callout: none;
     -webkit-user-select: none;
     -khtml-user-select: none;
@@ -398,20 +398,6 @@ td.generalLabel {
     user-select: none;
 }
 
-.torrentTable th {
-    padding: 5px 10px;
-    white-space: nowrap;
-}
-
-.torrentTable td {
-    padding: 0px 3px;
-    white-space: nowrap;
-}
-
-.torrentTable thead tr {
-    background-color: #eee;
-}
-
 #prop_general {
     padding: 2px;
 }
diff --git a/src/webui/www/public/properties_content.html b/src/webui/www/public/properties_content.html
index 60b3dca83..624922062 100644
--- a/src/webui/www/public/properties_content.html
+++ b/src/webui/www/public/properties_content.html
@@ -49,7 +49,7 @@
 
 <div id="prop_trackers" class="invisible">
     <div id="trackers">
-        <table class="torrentTable" cellpadding="0" cellspacing="0" style="width: 100%">
+        <table class="dynamicTable" style="width: 100%">
             <thead>
                 <tr>
                     <th style="width: 30%;">QBT_TR(URL)QBT_TR <img src="theme/list-add" id="addTrackersPlus"/></th>
@@ -65,7 +65,7 @@
 
 <div id="prop_peers" class="invisible">
     <div id="peers">
-        <table class="torrentTable" cellpadding="0" cellspacing="0" style="width: 100%">
+        <table class="dynamicTable" style="width: 100%">
             <thead>
                 <tr id="torrentPeersTableHeader" class="dynamicTableHeader">
                 </tr>
@@ -77,7 +77,7 @@
 
 <div id="prop_webseeds" class="invisible">
     <div id="webseeds">
-        <table class="torrentTable" cellpadding="0" cellspacing="0" style="width: 100%">
+        <table class="dynamicTable" style="width: 100%">
             <thead>
                 <tr>
                     <th>QBT_TR(URL)QBT_TR</th>
@@ -90,7 +90,7 @@
 
 <div id="prop_files" class="invisible">
     <div id="torrentFiles">
-        <table class="torrentTable" cellpadding="0" cellspacing="0" style="width: 100%">
+        <table class="dynamicTable" style="width: 100%">
             <thead>
                 <tr>
                     <th style="width: 30px; border-right: 0"><input type="checkbox" id="tristate_cb" style="display: none;" onclick="javascript:switchCBState()" /><label id="all_files_cb" class="tristate" for="tristate_cb"></label></th>
@@ -106,6 +106,6 @@
 </div>
 
 <script type="text/javascript">
-    torrentPeersTable.setup('torrentPeersTable', 'torrentPeersTableHeader', null);
+    //torrentPeersTable.setup('torrentPeersTable', 'torrentPeersTableHeader', null);
     $(getLocalStorageItem('selected_tab', 'PropGeneralLink')).click();
 </script>
diff --git a/src/webui/www/public/scripts/dynamicTable.js b/src/webui/www/public/scripts/dynamicTable.js
index cf5505b3b..6fec81a89 100644
--- a/src/webui/www/public/scripts/dynamicTable.js
+++ b/src/webui/www/public/scripts/dynamicTable.js
@@ -35,19 +35,65 @@ var DynamicTable = new Class({
 
         initialize : function () {},
 
-        setup : function (tableId, tableHeaderId, contextMenu) {
-            this.tableId = tableId;
-            this.tableHeaderId = tableHeaderId;
-            this.table = $(tableId);
+        setup : function (dynamicTableDivId, dynamicTableFixedHeaderDivId, contextMenu) {
+            this.dynamicTableDivId = dynamicTableDivId;
+            this.dynamicTableFixedHeaderDivId = dynamicTableFixedHeaderDivId;
+            this.fixedTableHeader = $(dynamicTableFixedHeaderDivId).getElements('tr')[0];
+            this.hiddenTableHeader = $(dynamicTableDivId).getElements('tr')[0];
+            this.tableBody = $(dynamicTableDivId).getElements('tbody')[0];
             this.rows = new Hash();
             this.selectedRows = new Array();
             this.columns = new Array();
             this.contextMenu = contextMenu;
-            this.sortedColumn = getLocalStorageItem('sorted_column_' + this.tableId, 0);
-            this.reverseSort = getLocalStorageItem('reverse_sort_' + this.tableId, '0');
+            this.sortedColumn = getLocalStorageItem('sorted_column_' + this.dynamicTableDivId, 0);
+            this.reverseSort = getLocalStorageItem('reverse_sort_' + this.dynamicTableDivId, '0');
             this.initColumns();
             this.loadColumnsOrder();
-            this.updateHeader();
+            this.updateTableHeaders();
+            this.setupEvents();
+        },
+
+        setupEvents : function () {
+            var scrollFn = function() {
+                $(this.dynamicTableFixedHeaderDivId).getElements('table')[0].style.left =
+                       -$(this.dynamicTableDivId).scrollLeft + 'px';
+            }.bind(this);
+
+            $(this.dynamicTableDivId).addEvent('scroll', scrollFn);
+
+            var resizeFn = function() {
+                var panel = $(this.dynamicTableDivId).getParent('.panel');
+                var h = panel.getBoundingClientRect().height - $(this.dynamicTableFixedHeaderDivId).getBoundingClientRect().height;
+                $(this.dynamicTableDivId).style.height = h + 'px';
+
+                // Workaround due to inaccurate calculation of elements heights by browser
+
+                var n = 2;
+
+                while (panel.clientWidth != panel.offsetWidth && n > 0) { // is panel vertical scrollbar visible ?
+                    n--;
+                    h -= 0.5;
+                    $(this.dynamicTableDivId).style.height = h + 'px';
+                }
+
+                this.lastPanelHeight = panel.getBoundingClientRect().height;
+            }.bind(this);
+
+            $(this.dynamicTableDivId).getParent('.panel').addEvent('resize', resizeFn);
+
+            this.lastPanelHeight = 0;
+
+            // Workaround. Resize event is called not always (for example it isn't called when browser window changes it's size)
+
+            var checkResizeFn = function() {
+                var panel = $(this.dynamicTableDivId).getParent('.panel');
+                if (this.lastPanelHeight != panel.getBoundingClientRect().height) {
+                    this.lastPanelHeight = panel.getBoundingClientRect().height;
+                    panel.fireEvent('resize');
+                }
+            }.bind(this);
+
+            setInterval(checkResizeFn, 500);
         },
 
         initColumns : function () {},
@@ -55,7 +101,7 @@ var DynamicTable = new Class({
         newColumn : function (name, style, caption) {
             var column = {};
             column['name'] = name;
-            column['visible'] = getLocalStorageItem('column_' + name + '_visible_' + this.tableId, '1');
+            column['visible'] = getLocalStorageItem('column_' + name + '_visible_' + this.dynamicTableDivId, '1');
             column['force_hide'] = false;
             column['caption'] = caption;
             column['style'] = style;
@@ -79,12 +125,13 @@ var DynamicTable = new Class({
             this.columns.push(column);
             this.columns[name] = column;
 
-            $(this.tableHeaderId).appendChild(new Element('th'));
+            this.hiddenTableHeader.appendChild(new Element('th'));
+            this.fixedTableHeader.appendChild(new Element('th'));
         },
 
         loadColumnsOrder : function () {
             columnsOrder = ['state_icon']; // status icon column is always the first
-            val = localStorage.getItem('columns_order_' + this.tableId);
+            val = localStorage.getItem('columns_order_' + this.dynamicTableDivId);
             if (val === null || val === undefined) return;
             val.split(',').forEach(function(v) {
                 if ((v in this.columns) && (!columnsOrder.contains(v)))
@@ -106,11 +153,16 @@ var DynamicTable = new Class({
                     val += ',';
                 val += this.columns[i].name;
             }
-            localStorage.setItem('columns_order_' + this.tableId, val);
+            localStorage.setItem('columns_order_' + this.dynamicTableDivId, val);
         },
 
-        updateHeader : function () {
-            var ths = $(this.tableHeaderId).getElements('th');
+        updateTableHeaders : function () {
+            this.updateHeader(this.hiddenTableHeader);
+            this.updateHeader(this.fixedTableHeader);
+        },
+
+        updateHeader : function (header) {
+            var ths = header.getElements('th');
 
             for (var i = 0; i < ths.length; i++) {
                 th = ths[i];
@@ -135,17 +187,22 @@ var DynamicTable = new Class({
         updateColumn : function (columnName) {
             var pos = this.getColumnPos(columnName);
             var visible = ((this.columns[pos].visible != '0') && !this.columns[pos].force_hide);
-            var ths = $(this.tableHeaderId).getElements('th');
-            if (visible)
+            var ths = this.hiddenTableHeader.getElements('th');
+            var fths = this.fixedTableHeader.getElements('th');
+            var trs = this.tableBody.getElements('tr');
+
+            if (visible) {
                 ths[pos].removeClass('invisible');
-            else
-                ths[pos].addClass('invisible');
-            var trs = this.table.getElements('tr');
-            for (var i = 0; i < trs.length; i++)
-                if (visible)
+                fths[pos].removeClass('invisible');
+                for (var i = 0; i < trs.length; i++)
                     trs[i].getElements('td')[pos].removeClass('invisible');
-                else
+            }
+            else {
+                ths[pos].addClass('invisible');
+                fths[pos].addClass('invisible');
+                for (var i = 0; i < trs.length; i++)
                     trs[i].getElements('td')[pos].addClass('invisible');
+            }
         },
 
         setSortedColumn : function (column) {
@@ -157,8 +214,8 @@ var DynamicTable = new Class({
                 // Toggle sort order
                 this.reverseSort = this.reverseSort == '0' ? '1' : '0';
             }
-            localStorage.setItem('sorted_column_' + this.tableId, column);
-            localStorage.setItem('reverse_sort_' + this.tableId, this.reverseSort);
+            localStorage.setItem('sorted_column_' + this.dynamicTableDivId, column);
+            localStorage.setItem('reverse_sort_' + this.dynamicTableDivId, this.reverseSort);
             this.updateTable(false);
         },
 
@@ -172,7 +229,7 @@ var DynamicTable = new Class({
             if (!MUI.ieLegacySupport)
                 return;
 
-            var trs = this.table.getElements('tr');
+            var trs = this.tableBody.getElements('tr');
             trs.each(function (el, i) {
                 if (i % 2) {
                     el.addClass('alt');
@@ -185,7 +242,7 @@ var DynamicTable = new Class({
         selectAll : function () {
             this.selectedRows.empty();
 
-            var trs = this.table.getElements('tr');
+            var trs = this.tableBody.getElements('tr');
             for (var i = 0; i < trs.length; i++) {
                 var tr = trs[i];
                 this.selectedRows.push(tr.rowId);
@@ -201,7 +258,7 @@ var DynamicTable = new Class({
         selectRow : function (rowId) {
             this.selectedRows.empty();
             this.selectedRows.push(rowId);
-            var trs = this.table.getElements('tr');
+            var trs = this.tableBody.getElements('tr');
             for (var i = 0; i < trs.length; i++) {
                 var tr = trs[i];
                 if (tr.rowId == rowId) {
@@ -259,7 +316,7 @@ var DynamicTable = new Class({
         },
 
         getTrByRowId : function (rowId) {
-            trs = this.table.getElements('tr');
+            trs = this.tableBody.getElements('tr');
             for (var i = 0; i < trs.length; i++)
                 if (trs[i].rowId == rowId)
                     return trs[i];
@@ -278,7 +335,7 @@ var DynamicTable = new Class({
                     i--;
                 }
 
-            var trs = this.table.getElements('tr');
+            var trs = this.tableBody.getElements('tr');
 
             for (var rowPos = 0; rowPos < rows.length; rowPos++) {
                 var rowId = rows[rowPos]['rowId'];
@@ -330,7 +387,7 @@ var DynamicTable = new Class({
                                 var first_row_id = this._this.selectedRows[0];
                                 var last_row_id = this.rowId;
                                 this._this.selectedRows.empty();
-                                var trs = this._this.table.getElements('tr');
+                                var trs = this._this.tableBody.getElements('tr');
                                 var select = false;
                                 for (var i = 0; i < trs.length; i++) {
                                     var tr = trs[i];
@@ -368,7 +425,7 @@ var DynamicTable = new Class({
 
                     // Insert
                     if (rowPos >= trs.length) {
-                        tr.inject(this.table);
+                        tr.inject(this.tableBody);
                         trs.push(tr);
                     }
                     else {
@@ -420,7 +477,7 @@ var DynamicTable = new Class({
         clear : function () {
             this.selectedRows.empty();
             this.rows.empty();
-            var trs = this.table.getElements('tr');
+            var trs = this.tableBody.getElements('tr');
             while (trs.length > 0) {
                 trs[trs.length - 1].dispose();
                 trs.pop();
@@ -442,7 +499,7 @@ var TorrentsTable = new Class({
         initColumns : function () {
             this.newColumn('priority', 'width: 30px', '#');
             this.newColumn('state_icon', 'width: 16px; cursor: default', '');
-            this.newColumn('name', 'min-width: 200px', 'QBT_TR(Name)QBT_TR');
+            this.newColumn('name', 'width: 200px', 'QBT_TR(Name)QBT_TR');
             this.newColumn('size', 'width: 100px', 'QBT_TR(Size)QBT_TR');
             this.newColumn('progress', 'width: 80px', 'QBT_TR(Done)QBT_TR');
             this.newColumn('num_seeds', 'width: 100px', 'QBT_TR(Seeds)QBT_TR');
@@ -763,7 +820,7 @@ var TorrentPeersTable = new Class({
             this.newColumn('uploaded', 'width: 30px', 'QBT_TR(Uploaded)QBT_TR[CONTEXT=PeerListWidget]');
             this.newColumn('connection', 'width: 30px', 'QBT_TR(Connection)QBT_TR');
             this.newColumn('flags', 'width: 30px', 'QBT_TR(Flags)QBT_TR');
-            this.newColumn('relevance', 'min-width: 30px', 'QBT_TR(Relevance)QBT_TR');
+            this.newColumn('relevance', 'width: 30px', 'QBT_TR(Relevance)QBT_TR');
 
             this.columns['country'].dataProperties.push('country_code');
             this.columns['flags'].dataProperties.push('flags_desc');
diff --git a/src/webui/www/public/transferlist.html b/src/webui/www/public/transferlist.html
index fb5444366..e088e66d6 100644
--- a/src/webui/www/public/transferlist.html
+++ b/src/webui/www/public/transferlist.html
@@ -1,10 +1,19 @@
-<table class="torrentTable" cellpadding="0" cellspacing="0">
-    <thead>
-        <tr id="torrentsTableHeader" class="dynamicTableHeader">
-        </tr>
-    </thead>
-    <tbody id="torrentsTable"></tbody>
-</table>
+<div id="torrentsTableFixedHeaderDiv" class="dynamicTableFixedHeaderDiv">
+    <table class="dynamicTable unselectable" style="position:relative;">
+        <thead>
+            <tr class="dynamicTableHeader"></tr>
+        </thead>
+    </table>
+</div>
+
+<div id="torrentsTableDiv" class="dynamicTableDiv">
+    <table class="dynamicTable unselectable">
+        <thead>
+            <tr class="dynamicTableHeader"></tr>
+        </thead>
+        <tbody></tbody>
+    </table>
+</div>
 
 <script type="text/javascript">
 
@@ -62,5 +71,5 @@
         }
     });
 
-    torrentsTable.setup('torrentsTable', 'torrentsTableHeader', torrentsTableContextMenu);
+    torrentsTable.setup('torrentsTableDiv', 'torrentsTableFixedHeaderDiv', torrentsTableContextMenu);
 </script>