diff --git a/galleryscript.js b/galleryscript.js
index 36640ba..369cab6 100644
--- a/galleryscript.js
+++ b/galleryscript.js
@@ -1016,6 +1016,9 @@ function showbigimage(i) {
     
     $('#desccontainer').html(getProgressEl()+currentlink(i)+imagedesc[i]);
     $('#desccontainer').css('display','block');
+    if (fullscreen) {
+          $('#imagecontainer')[0].scrollIntoView(true);
+    }
     if (zoom & !isHTML(imagelist[i])) {
         $(document).ready(function() {
             
@@ -1606,8 +1609,8 @@ function keypressed(e) {
     if (unicode==79) {
         fliporiginals();
     }
-    // s: setup
-    if (unicode==83) {
+    // s: setup or h: help
+    if (unicode==83 || unicode==72) {
         usersetupflip();
     }
     // x: mark image
@@ -1696,7 +1699,20 @@ function getsetupwindow() {
          '<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>';
+         '<div class="headsmall">Keyboard shortcuts</div>'+
+         '<div class="thumbmenu">'+
+         '<ul><li/>&larr;, &rarr;, j, k : Move to previous / next image'+
+         ' <li/>Shift &larr;, &rarr; : Jump to next page'+
+         ' <li/>Shift Home, End : Move to first / last image'+
+         ' <li/>a : show all thumbnails'+
+         ' <li/>f : toggle fullscreen'+
+         ' <li/>m : show all images as medium size'+
+         ' <li/>o : toggle originals'+
+         ' <li/>s/h : show setup'+
+         ' <li/>z : zoom in to image'+
+         ' <li/>x : mark image (creates a downloadable list of filenames)'+
+         '</ul>Further <a href="http://code.google.com/p/qalbum/wiki/Usage#Using_the_web_browser_UI" target="_BLANK">Help</a></div>'+
+         '<div class="thumbmenu"><input type="submit" value="Close" onclick="usersetupclose();" title="Close the setup window. [s]"/></div>';
     el.innerHTML=str;
     return el
 }   
diff --git a/gallerystyle.css b/gallerystyle.css
index 22fab07..e4a4309 100644
--- a/gallerystyle.css
+++ b/gallerystyle.css
@@ -165,6 +165,11 @@ body {
     background-color: white;
     border: solid 1px black;
 }
+#setupcontainer .thumbmenu ul {
+    list-style-type: none;
+    margin-top: 0px;
+    padding-left: 1ex;
+}
 h1 {
     font-size: large;
     font-family: sans-serif;