diff --git a/web/css/000-controls.css b/web/css/000-controls.css
index bcd4387..8ee98ad 100644
--- a/web/css/000-controls.css
+++ b/web/css/000-controls.css
@@ -30,6 +30,7 @@ a:hover {
 	padding: 1em;
 }
 #thumbs {
+	clear: both;
 	line-height: 0;
 }
 
diff --git a/web/js/011-display.js b/web/js/011-display.js
index 013248a..ce20424 100644
--- a/web/js/011-display.js
+++ b/web/js/011-display.js
@@ -120,6 +120,11 @@ $(document).ready(function() {
 			subalbumsElement = $("#subalbums");
 			subalbumsElement.empty();
 			subalbumsElement.append.apply(subalbumsElement, subalbums);
+
+			if (currentAlbum.albums.length > 1)
+				subalbumsElement.insertBefore(thumbsElement);
+			else
+				thumbsElement.insertBefore(subalbumsElement);
 		}
 		
 		if (currentPhoto === null) {