diff --git a/lsp/main.js b/lsp/main.js
index 3f7b7630..3f6d74d4 100755
--- a/lsp/main.js
+++ b/lsp/main.js
@@ -1298,7 +1298,7 @@ function buildstreamembed(streamName,embedbase) {
     return $(this).text() == streamName;
   }).addClass('current');
   
-  $('#subpage').append(
+  $('#subpage').html(
     $('<div>').addClass('input_container').html(
       $('<label>').text('The info embed URL is:').append(
         $('<input>').attr('type','text').attr('readonly','readonly').val(embedbase+'info_'+streamName+'.js')
diff --git a/lsp/pages.js b/lsp/pages.js
index 424a1469..04b26984 100755
--- a/lsp/pages.js
+++ b/lsp/pages.js
@@ -603,6 +603,15 @@ function showTab(tabName,streamName) {
               $('<td>').text('Live')
             )
           );
+          if (meta.buffer_window) {
+            $meta.append(
+              $('<tr>').html(
+                $('<td>').text('Buffer window:')
+              ).append(
+                $('<td>').text(meta.buffer_window+' ms')
+              )
+            );
+          }
         }
         else {
           $meta.html(
@@ -737,7 +746,7 @@ function showTab(tabName,streamName) {
           }
           $('#liststreams').append(
             $('<div>').addClass('button').text(settings.settings.streams[s].name).click(function(){
-              buildstreamembed($(this).text());
+              buildstreamembed($(this).text(),embedbase);
             })
           );
         }