diff --git a/frontend/app/frontend.py b/frontend/app/frontend.py
index 00c52a3..4fb57ff 100644
--- a/frontend/app/frontend.py
+++ b/frontend/app/frontend.py
@@ -26,8 +26,8 @@ def show_player(appname, hlsindex):
     playerTemplate = '%s/player.html.j2' % zomstream.configuration['template_folder']
     page = flask.render_template(
         playerTemplate, 
-        hlsindex=hlsindex,
         appname=appname,
+        hlsindex=hlsindex,
         configuration=zomstream.configuration
         )
     return page
diff --git a/frontend/app/templates/default/main.html.j2 b/frontend/app/templates/default/main.html.j2
index 7f723a7..7144f75 100644
--- a/frontend/app/templates/default/main.html.j2
+++ b/frontend/app/templates/default/main.html.j2
@@ -27,26 +27,19 @@
         <th></th>
       </tr>
       <tr>
-	<td>RTMP substream {{ item[2] }}</td>
+	<td>RTMP substream }}</td>
         <td><em class="url">rtmp://{{ configuration["rtmp_base"] }}/{{ item[0] }}/{{ item[2] }}</em></td>
         <td class="btn"><a href="rtmp://{{ configuration['rtmp_base'] }}/{{ item[0] }}/{{ item[2] }}" class="btn btn-red">&#9654;<br/>RTMP</a></td>
       </tr>
       <tr>
         <td>HLS m3u8</td>
 	<td><em class="url">{{ configuration['web_proto'] }}://{{ configuration['base_url'] }}/hls/{{ item[1] }}/index.m3u8</em></td>
-<!--	<td class="btn"><a href="{{ configuration['web_proto'] }}://{{ configuration['base_url'] }}/player/{{ item[1] }}" class="btn btn-green">&#9654;<br/>HLS.js</a></td> -->
 	<td class="btn"><a href="{{ url_for('frontend.show_player', appname=item[0], hlsindex=item[1]) }}" class="btn btn-green">&#9654;<br/>HLS.js</a></td>
       </tr>
     </tbody>
   </table>
 </article>
 {% endfor %}
-
-  <a href="{{ url_for('frontend.show_player', streamname=item[1], appname=item[0]) }}"
-    class="btn-large btn-green">
-      &#9655; Web Player
-    </a>
-
 </main>
 <footer>
 {{ configuration["footer"] }}
diff --git a/frontend/app/zomstream.py b/frontend/app/zomstream.py
index 8c64002..583adee 100644
--- a/frontend/app/zomstream.py
+++ b/frontend/app/zomstream.py
@@ -41,7 +41,7 @@ class Zomstream:
                     name = stream.find('name')
                     rate = stream.find('bw_video')
                     streamname = name.text
-                    hlsindex = streamname.split('_'[0]
+                    hlsindex = streamname.split('_')[0]
                     if rate.text != "0":
                         self.streamnames.append( [appname.text, hlsindex, streamname] )