diff --git a/galleryscript.js b/galleryscript.js
index 3dac417..36640ba 100644
--- a/galleryscript.js
+++ b/galleryscript.js
@@ -1114,7 +1114,7 @@ function thumblist(n,curr) {
     if (maxThumb%2==1) { nright+=1; nleft+=1; }
     leftstr='<span title="[shift left arrow]" id="arrowleft" class="thumbbox" onclick="thumblist('+String(nleft)+','+String(curr)+')">&larr; <div class="arrowtext">('+ends.first+')</div></span>';
     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>'+
+    menustr='<span id="thumbmenu" class="thumbmenu">'+
            ' <span class="menuitem" id="setupbutton" onclick="usersetupflip()">(S)etup</span>';
     thumbstr='<div><span class="headsmall">Images</span>'+menustr+'</div><div id="thumbrow">'+leftstr;
     for (i=ends.first; i<ends.last; i++) {
@@ -1182,13 +1182,17 @@ function allmediums() {
     // Shows all the medium sized in the current folder
     thumbstr='<div id="thumbrow">';
     for (i=0; i<imagelist.length; i++) {
-        thumbstr+='<span id="n'+i+'" class="medium"><img title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_med/med_'+(encodeURIComponent(imagelist[i]))+'.jpg"></span>';
+        thumbstr+='<span id="n'+i+'" class="medium"><img id="img'+i+'" title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_med/med_'+(encodeURIComponent(imagelist[i]))+'.jpg"></span>';
     }
     thumbstr+='</div>';
     $('#thumbcontainer').html(thumbstr);
     $('#imagecontainer').html('');
     $('#imagecontainer').css('height',0);
     $('#desccontainer').hide();
+    for (i=0; i<imagelist.length; i++) {
+        $('#img'+i).css('max-height',document.body.clientHeight);
+        $('#img'+i).css('max-width',document.body.clientWidth);
+    }
     currentimage=-1;
     return;
 }
@@ -1688,6 +1692,8 @@ function getsetupwindow() {
          '<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><input type="submit" value="All thumbnails" onclick="allthumbs();" title="all thumbnails view. [a]"/>'+
+         '<input type="submit" value="All medium images" onclick="allmediums();" title="all medium images view. [m]"/></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>';