diff --git a/maraschino/modules.py b/maraschino/modules.py
index 39db73e1..e016f3ff 100644
--- a/maraschino/modules.py
+++ b/maraschino/modules.py
@@ -189,6 +189,18 @@
                 'description': 'Show Power Controls',
                 'type': 'bool',
             },
+            {
+                'key': 'library_show_music',
+                'value': '1',
+                'description': 'Show music',
+                'type': 'bool',
+            },
+            {
+                'key': 'library_show_files',
+                'value': '1',
+                'description': 'Show files',
+                'type': 'bool',
+            },
         ]
     },
     {
diff --git a/modules/index.py b/modules/index.py
index a48bebb9..d73b9006 100644
--- a/modules/index.py
+++ b/modules/index.py
@@ -129,6 +129,8 @@ def index():
         fanart_backgrounds = fanart_backgrounds,
         applications = applications,
         library_show_power_buttons = library_show_power_buttons,
+        show_music=get_setting_value('library_show_music') == '1',
+        show_files=get_setting_value('library_show_files') == '1',
         show_tutorial = unorganised_modules.count() == 0,
         webroot = maraschino.WEBROOT,
         kiosk = maraschino.KIOSK,
diff --git a/modules/library.py b/modules/library.py
index 572f9c70..5f1e471e 100644
--- a/modules/library.py
+++ b/modules/library.py
@@ -353,6 +353,8 @@ def render_library(library=None, title="Media Library", file_type=None, previous
         file_type=file_type,
         previous_dir=previous_dir,
         show_info=get_setting_value('library_show_info') == '1',
+        show_music=get_setting_value('library_show_music') == '1',
+        show_files=get_setting_value('library_show_files') == '1',
         library_show_power_buttons=get_setting_value('library_show_power_buttons', '1') == '1',
         bannerart=get_setting_value('library_use_bannerart') == '1',
     )
diff --git a/templates/library.html b/templates/library.html
index 0576d030..6d6b7134 100644
--- a/templates/library.html
+++ b/templates/library.html
@@ -141,7 +141,7 @@ <h2>{{ title }}</h2>
               <img src="{{ url_for('static', filename='images/tick.png') }}" class="watched" width="16" height="16">
             {% endif %}
           </li>
-		  {% endfor %}
+        {% endfor %}
       {% endif %}
 
       {% if library.moviedetails %}
@@ -323,20 +323,24 @@ <h2>Media Library</h2>
     <ul>
       <li class="get" data-command="movies">Movies</li>
       <li class="get" data-command="shows">TV Shows</li>
-      <li class="get" data-command="artists">Music</li>
-      <li class="get" data-command="files">Files</li>
+      {% if show_music %}
+        <li class="get" data-command="artists">Music</li>
+      {% endif %}
+      {% if show_files %}
+        <li class="get" data-command="files">Files</li>
+      {% endif %}
     </ul>
 
   {% endif %}
 
     <div id="filter"><input type="search" name="input" class="filter" value="Filter" onclick="this.value='';" onfocus="this.select()" onblur="this.value=!this.value?'Filter':this.value;"></input></div>
-	{% if message %}
+  {% if message %}
       <div class="message">{{ message }}</div>
     {% endif %}
     <div class="powerholder" style="text-align:right" >
 
   {% if library %}
-	{% if library.moviedetails %}
+    {% if library.moviedetails %}
       {% if library.moviedetails.resume.position >= 1 %}
         <a class="info_buttons" id="resume" media-type="movie" data-id="{{ library.moviedetails.movieid }}" title="Resume Movie">Resume</a>
       {% endif %}
@@ -346,27 +350,27 @@ <h2>Media Library</h2>
         <a class="info_buttons" id="trailer" data-id="{{ library.moviedetails.movieid }}" title="Play Trailer">Trailer</a>
       {% endif %}
 
-	{% elif library.tvshowdetails %}
+    {% elif library.tvshowdetails %}
       <a class="info_buttons" id="play" file-type="video" media-type="tvshow" data-id="{{ library.tvshowdetails.tvshowid }}" title="Play TV show">Play</a>
       <a class="info_buttons" id="queue" file-type="video" media-type="tvshow" data-id="{{ library.tvshowdetails.tvshowid }}" title="Add to Queue">Queue</a>
 
-	{% elif library.episodedetails %}
+    {% elif library.episodedetails %}
       {% if library.episodedetails.resume.position >= 1 %}
         <a class="info_buttons" id="resume" file-type="video" media-type="episode" data-id="{{ library.episodedetails.episodeid }}" title="Resume Episode">Resume</a>
       {% endif %}
       <a class="info_buttons" id="play" file-type="video" media-type="episode" data-id="{{ library.episodedetails.episodeid }}" title="Play Episode">Play</a>
       <a class="info_buttons" id="queue" file-type="video" media-type="episode" data-id="{{ library.episodedetails.episodeid }}" title="Add to Queue">Queue</a>
 
-	{% elif library.artistdetails %}
+    {% elif library.artistdetails %}
       <a class="info_buttons" id="play" file-type="audio" media-type="artist" data-id="{{ library.artistdetails.artistid }}" title="Play All Albums">Play</a>
       <a class="info_buttons" id="queue" file-type="audio" media-type="artist" data-id="{{ library.artistdetails.artistid }}" title="Add to Queue">Queue</a>
 
-	{% elif library.albumdetails %}
+    {% elif library.albumdetails %}
       <a class="info_buttons" id="play" file-type="audio" media-type="album" data-id="{{ library.albumdetails.albumid }}" title="Play Album">Play</a>
       <a class="info_buttons" id="queue" file-type="audio" media-type="album" data-id="{{ library.albumdetails.albumid }}" title="Add to Queue">Queue</a>
     {% endif %}
 
-	{% if library.tvshows or library.seasons or library.episodes or library.movies or library.moviedetails or library.tvshowdetails or library.episodedetails or file_type == "video_directory" %}
+    {% if library.tvshows or library.seasons or library.episodes or library.movies or library.moviedetails or library.tvshowdetails or library.episodedetails or file_type == "video_directory" %}
       <a class="power" title ="Update Video Library" id="video-update"><img src="{{ url_for('static', filename='images/refresh.png') }}" width="14" height="14"/></a>
       <a class="power" title ="Clean Video Library" id="video-clean"><img src="{{ url_for('static', filename='images/clean.png') }}" width="14" height="14"/></a>
 
@@ -379,10 +383,14 @@ <h2>Media Library</h2>
   {% if message %}
       <a class="power" title="Try Wake On LAN" id="poweron"><img src="{{ url_for('static', filename='images/poweron.png') }}" width="14" height="14"/></a>
   {% endif %}
+  {% if not library and not show_music %}
+      <a class="power" title ="Update Video Library" id="video-update"><img src="{{ url_for('static', filename='images/refresh.png') }}" width="14" height="14"/></a>
+      <a class="power" title ="Clean Video Library" id="video-clean"><img src="{{ url_for('static', filename='images/clean.png') }}" width="14" height="14"/></a>
+  {% endif %}
   {% if library_show_power_buttons %}
-      <a class="power" title ="Suspend" id="suspend" ><img src="{{ url_for('static', filename='images/suspend.png') }}" width="14" height="14"/></a>
-      <a class="power" title ="Reboot" id="reboot" ><img src="{{ url_for('static', filename='images/reboot.png') }}" width="14" height="14"/></a>
-      <a class="power" title ="Shutdown" id="poweroff" ><img src="{{ url_for('static', filename='images/shutdown.png') }}" width="14" height="14"/></a>
+    <a class="power" title ="Suspend" id="suspend" ><img src="{{ url_for('static', filename='images/suspend.png') }}" width="14" height="14"/></a>
+    <a class="power" title ="Reboot" id="reboot" ><img src="{{ url_for('static', filename='images/reboot.png') }}" width="14" height="14"/></a>
+    <a class="power" title ="Shutdown" id="poweroff" ><img src="{{ url_for('static', filename='images/shutdown.png') }}" width="14" height="14"/></a>
   {% endif %}
 
     </div>