diff --git a/htdocs/index.html b/htdocs/index.html
index 66c7cc0..3310b29 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -504,7 +504,7 @@
   </footer>
 
   <!-- Modals -->
-  <div class="modal fade" id="modalConnectionError" role="dialog">
+  <div class="modal fade" id="modalConnectionError" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header bg-danger text-light">
@@ -517,17 +517,16 @@
       </div>
   </div>
 
-  <div class="modal fade" id="modalAddToPlaylist" role="dialog">
+  <div class="modal fade" id="modalAddToPlaylist" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title"><span class="material-icons title-icon">playlist_add</span> <span id="addToPlaylistLabel">Add to playlist</span></h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal">
+            <span>&times;</span>
           </button>
         </div>
         <div class="modal-body">
-
           <form id="addStreamFrm" class="needs-validation hide" novalidate>
             <div class="row">
               <div class="form-group col-md-12">
@@ -566,16 +565,16 @@
           <button type="button" class="btn btn-success" data-href="{'cmd': 'addStream', 'options': []}">Add</button>
         </div>                
       </div>
-      </div>
+    </div>
   </div>
 
-  <div class="modal fade" id="modalRenamePlaylist" role="dialog">
+  <div class="modal fade" id="modalRenamePlaylist" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title"><span class="material-icons title-icon">playlist_add</span>Rename playlist</h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal">
+            <span>&times;</span>
           </button>
         </div>
         <div class="modal-body">
@@ -599,13 +598,13 @@
       </div>
   </div>
 
-  <div class="modal fade" id="modalSettings" tabindex="-1" role="dialog" aria-labelledby="settingsLabel" aria-hidden="true">
+  <div class="modal fade" id="modalSettings" tabindex="-1" role="dialog">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title" id="settingsLabel"><span class="material-icons title-icon">settings</span> Settings</h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal">
+            <span>&times;</span>
           </button>
         </div>
         <div class="modal-body">
@@ -688,17 +687,17 @@
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-success" data-href="{'cmd': 'confirmSettings', 'options': []}">Save</button>
         </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
+      </div>
+    </div>
+  </div>
   
-  <div class="modal fade" id="modalAbout" tabindex="-1" role="dialog" aria-labelledby="settingsLabel" aria-hidden="true">
+  <div class="modal fade" id="modalAbout" tabindex="-1" role="dialog">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title" id="aboutLabel"><span class="material-icons title-icon">play_circle_outline</span> About</h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal">
+            <span>&times;</span>
           </button>
         </div>
         <div class="modal-body">
@@ -725,17 +724,17 @@
             </tbody>
           </table>          
         </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
+      </div>
+    </div>
+  </div>
 
-  <div class="modal fade" id="modalSaveQueue" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal fade" id="modalSaveQueue" tabindex="-1" role="dialog">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title"><span class="material-icons title-icon">save</span> Save Queue</h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal">
+            <span>&times;</span>
           </button>          
         </div>
         <div class="modal-body">
@@ -753,17 +752,17 @@
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-success" data-href="{'cmd': 'saveQueue', 'options': []}">Save Queue</button>
         </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
+      </div>
+    </div>
+  </div>
 
-  <div class="modal fade" id="modalSongDetails" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal fade" id="modalSongDetails" tabindex="-1" role="dialog">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title"><span class="material-icons title-icon">music_note</span> Song Details</h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal">
+            <span>&times;</span>
           </button>          
         </div>
         <div class="modal-body">
@@ -784,9 +783,9 @@
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
         </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
+      </div>
+    </div>
+  </div>
 
   <script src="js/bootstrap-native-v4.min.js"></script>
   <script src="js/mpd.js"></script>