diff --git a/galleryscript.js b/galleryscript.js
index de0646f..1a70b3e 100644
--- a/galleryscript.js
+++ b/galleryscript.js
@@ -157,14 +157,9 @@ function thumblist(n,curr) {
     rightstr='<span title="[shift right arrow]" id="arrowright" class="thumbbox" onclick="thumblist('+String(nright)+','+String(curr)+')">&rarr; <div class="arrowtext">('+(imagelist.length-ends.last)+')</div></span>';
     menustr='<span id="thumbmenu" class="thumbmenu"><span id="allthumbs" class="menuitem" onclick="allthumbs()" title="show all thumbs">all thumbnails</span>'+
            ' <span class="menuitem" id="setupbutton" onclick="usersetupflip()">(S)etup</span>';
-           //'<span>Order:</span><span class="menuitem" id="sortalpha" onclick="sortlist(\'alpha\')">name</span>/'+
-           //'<span class="menuitem" id="sorttime" onclick="sortlist(\'time\')">time</span>/'+
-           //'<span class="menuitem" id="sortrev" onclick="sortlist(\'rev\')">reverse</span>'+
-           //'<span>Original:</span><span class="menuitem" id="originals" onclick="fliporiginals()">'+String(originals)+'</span>'+
-           //'<span>Fullscreen:</span><span class="menuitem" id="fullscreen" onclick="flipfullscreen()">'+String(fullscreen)+'</span></span>';
     thumbstr='<div><span class="headsmall">Images</span>'+menustr+'</div><div id="thumbrow">'+leftstr;
     for (i=ends.first; i<ends.last; i++) {
-        thumbstr+='<span id="n'+i+'" class="imagebox thumbbox"><img class="thumbimage" title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_tn/tn_'+encodeURIComponent(imagelist[i])+'.jpg"><br/><a href="'+encodeURIComponent(imagelist[i])+'" target="_blank">'+nicestring((imagelist[i]))+'</a></span>';
+        thumbstr+='<span id="n'+i+'" class="imagebox thumbbox"><img class="thumbimage" title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_tn/tn_'+encodeURIComponent(imagelist[i])+'.jpg"><br/><a href="'+encodeURIComponent(imagelist[i])+'" target="_blank" title="'+titlestring(imagedesc[i])+'">'+nicestring((imagelist[i]))+'</a></span>';
     }
     thumbstr+=rightstr+'</div>';
     ob.innerHTML=thumbstr;
@@ -632,6 +627,7 @@ function usersetup() {
         document.body.appendChild(el);
         el.scrollIntoView(true);
         document.getElementById('configSlideInterval').value=slideshowinterval;
+        usersetupupdate();
         configupdatetimer=setInterval('usersetupupdate()',500);
     }
     return
@@ -667,19 +663,15 @@ function getsetupwindow() {
     /* Returns an object containing the long help text */
     var el = document.createElement('div'); 
     el.setAttribute("id", 'setupcontainer');
-    //el.setAttribute("class", 'result-help');
-    var str='<input type="submit" value="Close" onclick="usersetupclose();" title="Close the setup window. [s]"/>';
-    /* Items to setup:
-     * var currentimage=-1; = offset
-    */
-    str+='<div class="headsmall">Configuration</div> '+
+    var str='<div class="headsmall">Configuration</div> '+
          '<div><input type="submit" id="configFullscreen" value="Fullscreen" onclick="flipfullscreen();" title="Use maximum area for the image. [f]"/>'+
          '<input type="submit" id="configOriginals" value="Originals" onclick="fliporiginals();" title="Use original images, rather than web optimized JPEGs. [o]"/></div>'+
          '<div><input type="submit" id="configSortName" value="Sort by name" onclick="sortlist(\'alpha\');" title="Sort thumbnail list by image name."/>'+
          '<input type="submit" id="configSortTime" value="Sort by time" onclick="sortlist(\'time\');" title="Sort thumbnail list by image modification time."/>'+
          '<input type="submit" id="configSortRev" value="Reverse sort" onclick="sortlist(\'rev\');" title="Sort thumbnail list in reverse order."/></div>'+
-         '<div>Slideshow: <input type="text" id="configSlideInterval" size=3 title="Slideshow image change interval. 0 to disable. Use negative number to reverse showing order." onchange="slidesetupfromconfig();"/> seconds</div>';
-    str+='<div id="configExample"></div>';
+         '<div class="thumbmenu">Slideshow: <input type="text" id="configSlideInterval" size=3 title="Slideshow image change interval. 0 to disable. Use negative number to reverse showing order." onchange="slidesetupfromconfig();"/> seconds</div>'+
+         '<div id="configExample" class="thumbmenu"></div>'+
+         '<div class="thumbmenu"><input type="submit" value="Close" onclick="usersetupclose();" title="Close the setup window. [s]"/> <a href="http://code.google.com/p/qalbum/wiki/Usage#Using_the_web_browser_UI" target="_BLANK">Help</a></div>';
     el.innerHTML=str;
     return el
 }