diff --git a/docs/Commands List.md b/docs/Commands List.md
index 6efe3e61..8a5df38c 100644
--- a/docs/Commands List.md	
+++ b/docs/Commands List.md	
@@ -1,19 +1,18 @@
 ######For more information and how to setup your own NadekoBot, go to: <http://github.com/Kwoth/NadekoBot/wiki>
 ######You can support the project on patreon: <https://patreon.com/nadekobot> or paypal: `nadekodiscordbot@gmail.com`
 ##Table Of Contents
-- [Permissions](#Permissions)
-- [Games](#Games)
-- [NSFW](#NSFW)
-- [Searches](#Searches)
-- [ClashOfClans](#ClashOfClans)
-- [Music](#Music)
-- [Utility](#Utility)
-- [Gambling](#Gambling)
-- [CustomReactions](#CustomReactions)
-- [Help](#Help)
-- [Administration](#Administration)
+- [Music](#music)
+- [Gambling](#gambling)
+- [Permissions](#permissions)
+- [Administration](#administration)
+- [ClashOfClans](#clashofclans)
+- [Utility](#utility)
+- [Games](#games)
+- [Help](#help)
+- [NSFW](#nsfw)
+- [CustomReactions](#customreactions)
+- [Searches](#searches)
 
-###### [Back to TOC](#table-of-contents)
 
 ### Administration  
 Command and aliases | Description | Usage
diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs
index 2ca86e0f..6d487c0d 100644
--- a/src/NadekoBot/Modules/Help/Help.cs
+++ b/src/NadekoBot/Modules/Help/Help.cs
@@ -128,14 +128,15 @@ namespace NadekoBot.Modules.Help
             helpstr.AppendLine(@"######For more information and how to setup your own NadekoBot, go to: <http://github.com/Kwoth/NadekoBot/wiki>
 ######You can support the project on patreon: <https://patreon.com/nadekobot> or paypal: `nadekodiscordbot@gmail.com`");
             helpstr.AppendLine("##Table Of Contents");
-            helpstr.AppendLine(string.Join("\n", NadekoBot.CommandService.Modules.Select(m => $"- [{m.Name}](#{m.Name})")));
+            helpstr.AppendLine(string.Join("\n", NadekoBot.CommandService.Modules.Select(m => $"- [{m.Name}](#{m.Name.ToLowerInvariant()})")));
             helpstr.AppendLine();
-            var lastModule = "";
+            string lastModule = null;
             foreach (var com in _commands.Commands.OrderBy(com=>com.Module.Name).GroupBy(c=>c.Text).Select(g=>g.First()))
             {
                 if (com.Module.Name != lastModule)
                 {
-                    helpstr.AppendLine("###### [Back to TOC](#table-of-contents)");
+                    if (lastModule != null)
+                        helpstr.AppendLine("###### [Back to TOC](#table-of-contents)");
                     helpstr.AppendLine();
                     helpstr.AppendLine("### " + com.Module.Name + "  ");
                     helpstr.AppendLine("Command and aliases | Description | Usage");