diff --git a/docs/docresources/configtvhlog.png b/docs/docresources/configtvhlog.png
new file mode 100644
index 00000000..1e4320fd
Binary files /dev/null and b/docs/docresources/configtvhlog.png differ
diff --git a/docs/html/config_tvhlog.html b/docs/html/config_tvhlog.html
new file mode 100644
index 00000000..4f94bf34
--- /dev/null
+++ b/docs/html/config_tvhlog.html
@@ -0,0 +1,28 @@
+<div class="hts-doc-text">
+
+ <img src="docresources/configtvhlog.png"></img>
+
+ <p>This tab is used to configure various debugging options in tvheadend.</p>
+
+ <p>Configuration options:</p>
+
+ <dl>
+
+  <dt>Debug log path</dt>
+  <dd></dd>
+
+  <dt>Debug to syslog</dt>
+  <dd></dd>
+
+  <dt>Debug trace (low-level stuff)</dt>
+  <dd></dd>
+
+  <dt>Debug subsystems</dt>
+  <dd></dd>
+
+  <dt>Trace subsystems</dt>
+  <dd></dd>
+
+ </dl>
+ Changes to any of these settings must be confirmed by pressing the 'Save configuration' button before taking effect.
+</div>
diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index f7773824..a4fc108c 100644
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -204,16 +204,19 @@ tvheadend.dvrschedule = function(title, iconCls, dvrStore) {
             width: 250,
             id: 'title',
             header: "Title",
+            sortable: true,
             dataIndex: 'title'
         }, {
             width: 100,
             id: 'episode',
             header: "Episode",
+            sortable: true,
             dataIndex: 'episode'
         }, {
             width: 100,
             id: 'pri',
             header: "Priority",
+            sortable: true,
             dataIndex: 'pri',
             renderer: renderPri,
             hidden: iconCls !== 'clock'
@@ -221,6 +224,7 @@ tvheadend.dvrschedule = function(title, iconCls, dvrStore) {
             width: 100,
             id: 'start',
             header: iconCls === 'clock' ? "Start" : "Date/Time",
+            sortable: true,
             dataIndex: 'start',
             renderer: renderDate
         }, {
@@ -228,18 +232,21 @@ tvheadend.dvrschedule = function(title, iconCls, dvrStore) {
             hidden: true,
             id: 'end',
             header: "End",
+            sortable: true,
             dataIndex: 'end',
             renderer: renderDate
         }, {
             width: 100,
             id: 'duration',
             header: "Duration",
+            sortable: true,
             dataIndex: 'duration',
             renderer: renderDuration
         }, {
             width: 100,
             id: 'filesize',
             header: "Filesize",
+            sortable: true,
             dataIndex: 'filesize',
             renderer: renderSize,
             hidden: iconCls !== 'television'
@@ -247,17 +254,20 @@ tvheadend.dvrschedule = function(title, iconCls, dvrStore) {
             width: 250,
             id: 'channel',
             header: "Channel",
+            sortable: true,
             dataIndex: 'channel'
         }, {
             width: 200,
             id: 'creator',
             header: "Created by",
+            sortable: true,
             hidden: true,
             dataIndex: 'creator'
         }, {
             width: 200,
             id: 'config_name',
             header: "DVR Configuration",
+            sortable: true,
             renderer: function(value, metadata, record, row, col, store) {
                 if (!value) {
                     return '<span class="tvh-grid-unset">(default)</span>';
@@ -272,6 +282,7 @@ tvheadend.dvrschedule = function(title, iconCls, dvrStore) {
             width: 200,
             id: 'status',
             header: "Status",
+            sortable: true,
             dataIndex: 'status',
             hidden: iconCls !== 'exclamation'
         }]);
@@ -684,8 +695,7 @@ tvheadend.dvr = function() {
                 }],
             url: url,
             autoLoad: true,
-            id: 'id',
-            remoteSort: true
+            id: 'id'
         });
     }
     tvheadend.dvrStoreUpcoming = datastoreBuilder('dvrlist_upcoming');
diff --git a/src/webui/static/app/tvhlog.js b/src/webui/static/app/tvhlog.js
index d5c6e92c..8062b7ac 100644
--- a/src/webui/static/app/tvhlog.js
+++ b/src/webui/static/app/tvhlog.js
@@ -12,7 +12,7 @@ tvheadend.tvhlog = function() {
      * ***************************************************************/
 
     var tvhlogLogPath = new Ext.form.TextField({
-        fieldLabel: 'Debug Log Path',
+        fieldLabel: 'Debug log path',
         name: 'tvhlog_path',
         allowBlank: true,
         width: 400
@@ -29,14 +29,14 @@ tvheadend.tvhlog = function() {
     });
 
     var tvhlogDebugSubsys = new Ext.form.TextField({
-        fieldLabel: 'Debug Subsystems',
+        fieldLabel: 'Debug subsystems',
         name: 'tvhlog_debug',
         allowBlank: true,
         width: 400
     });
 
     var tvhlogTraceSubsys = new Ext.form.TextField({
-        fieldLabel: 'Trace Subsystems',
+        fieldLabel: 'Trace subsystems',
         name: 'tvhlog_trace',
         allowBlank: true,
         width: 400
@@ -60,6 +60,16 @@ tvheadend.tvhlog = function() {
         }
     });
 
+    var DebuggingPanel = new Ext.form.FieldSet({
+        title: 'Debugging Options',
+        width: 700,
+        autoHeight: true,
+        collapsible: true,
+        animCollapse : true,
+        items: [tvhlogLogPath, tvhlogToSyslog,
+            tvhlogTraceOn, tvhlogDebugSubsys, tvhlogTraceSubsys]
+    });
+
     var confpanel = new Ext.form.FormPanel({
         title: 'Debugging',
         iconCls: 'wrench',
@@ -72,8 +82,7 @@ tvheadend.tvhlog = function() {
         layout: 'form',
         defaultType: 'textfield',
         autoHeight: true,
-        items: [tvhlogLogPath, tvhlogToSyslog,
-            tvhlogTraceOn, tvhlogDebugSubsys, tvhlogTraceSubsys],
+        items: [DebuggingPanel],
         tbar: [saveButton, '->', helpButton]
     });