diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6789442..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "docs"]
-	path = docs
-	url = https://github.com/slash2009/XWMM.wiki.git
diff --git a/addon.xml b/addon.xml
index 3ba25a0..85b5ef5 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="webinterface.XWMM"
-  version="4.1.5"
+  version="4.1.6"
   name="XWMM"
   provider-name="slash | Zernable | MokuJinJin | nwtn | fyfe | criticalfiction">
   <requires>
diff --git a/changelog.txt b/changelog.txt
index c9949d2..5990eca 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,11 @@
 XWMM Change log
 
+4.1.6
+- Add header icon that was missed in a7f7ee5
+- Rename field that was missed from 0ebbce8
+- Allow ignore article sort with genres and sets
+- Fix padding on season and episode list when there's a scrollbar
+
 4.1.5
 - Don't freak out when XBMC returns no results
 - Rewrite movie set management feature (Issue #88)
diff --git a/docs b/docs
deleted file mode 160000
index 0b4592d..0000000
--- a/docs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0b4592d8371732bd9c070bb7d1e9064691a48861
diff --git a/resources/js/app/common/genre.js b/resources/js/app/common/genre.js
index ee3ec83..c2d0eff 100644
--- a/resources/js/app/common/genre.js
+++ b/resources/js/app/common/genre.js
@@ -29,15 +29,21 @@ Ext.ns('XWMM.video');
         { name: 'label', type: 'string' }
     ]);
 
+    var sortArticles = docCookies.getItem('sortArticles') === '1';
+
     XWMM.video.genreStore = new Ext.data.Store({
-        sortInfo: { field: 'label', direction: 'ASC' },
         proxy: new Ext.data.XBMCProxy({
             url: '/jsonrpc',
             xbmcParams: {
                 jsonrpc: '2.0',
                 method: 'VideoLibrary.GetGenres',
                 params: {
-                    type: 'movie'
+                    type: 'movie',
+                    sort: {
+                        order: 'ascending',
+                        ignorearticle: sortArticles,
+                        method: 'label'
+                    }
                 },
                 id: 'XWMM'
             }
diff --git a/resources/js/app/common/global.js b/resources/js/app/common/global.js
index 1c63828..d964ea4 100644
--- a/resources/js/app/common/global.js
+++ b/resources/js/app/common/global.js
@@ -22,7 +22,7 @@
  * along with XWMM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var myVersion = '4.1.5';
+var myVersion = '4.1.6';
 
 /**
  * Protect window.console method calls, e.g. console is not defined on IE
diff --git a/resources/js/app/movies/movie.js b/resources/js/app/movies/movie.js
index 9bc3f22..2b764a0 100644
--- a/resources/js/app/movies/movie.js
+++ b/resources/js/app/movies/movie.js
@@ -111,7 +111,7 @@ var otherDetailsPanel = new Ext.FormPanel({
     items: [
         {
             fieldLabel: 'Name',
-            name: 'strFilename',
+            name: 'file',
             readOnly: true
         },
         {
diff --git a/resources/js/app/movies/movieset.js b/resources/js/app/movies/movieset.js
index 0e87510..9bc7c27 100644
--- a/resources/js/app/movies/movieset.js
+++ b/resources/js/app/movies/movieset.js
@@ -30,13 +30,21 @@ Ext.ns('XWMM.video');
         { name: 'label' }
     ]);
 
+    var sortArticles = docCookies.getItem('sortArticles') === '1';
+
     XWMM.video.movieSetStore = new Ext.data.Store({
-        sortInfo: { field: 'label', direction: 'ASC' },
         proxy: new Ext.data.XBMCProxy({
             url: '/jsonrpc',
             xbmcParams: {
                 jsonrpc: '2.0',
                 method: 'VideoLibrary.GetMovieSets',
+                params: {
+                    sort: {
+                        order: 'ascending',
+                        ignorearticle: sortArticles,
+                        method: 'label'
+                    }
+                },
                 id: 'XWMM'
             }
         }),
diff --git a/resources/js/app/tvshows/tvshow.js b/resources/js/app/tvshows/tvshow.js
index f6a6d34..44ccd3f 100644
--- a/resources/js/app/tvshows/tvshow.js
+++ b/resources/js/app/tvshows/tvshow.js
@@ -390,7 +390,6 @@ var seasonGrid = new Ext.grid.GridPanel({
     stripeRows: true,
 
     viewConfig: {
-        scrollOffset: 1,
         headersDisabled: true
     },
 
@@ -415,15 +414,14 @@ var episodeGrid = new Ext.grid.GridPanel({
     cm: new Ext.grid.ColumnModel([
         { header: '#', dataIndex: 'episode', width: 30 },
         { header: 'Title', dataIndex: 'title', id: 'title' },
-        { header: '&#160;', dataIndex: 'playcount', width: 30, tooltip: 'Watched',
-          renderer: checkWatched }
+        { header: '<img src="../resources/images/icons/checked.png" width="16" height="16" alt="Watched">',
+          dataIndex: 'playcount', width: 30, tooltip: 'Watched', renderer: checkWatched }
     ]),
     autoExpandColumn: 'title',
     enableColumnResize: false,
     stripeRows: true,
 
     viewConfig: {
-        scrollOffset: 1,
         headersDisabled: true
     },