diff --git a/css/jquery.uls.css b/css/jquery.uls.css
index 7a7d402..6074e60 100644
--- a/css/jquery.uls.css
+++ b/css/jquery.uls.css
@@ -241,6 +241,10 @@ div.uls-region {
 	float: right;
 }
 
+.uls-menu.uls-narrow .uls-search-label {
+	background-size: 20px;
+}
+
 .uls-menu .uls-languagefilter-clear {
 	/* @embed */
 	background: transparent url('../images/clear.png') no-repeat scroll left center;
diff --git a/src/jquery.uls.lcd.js b/src/jquery.uls.lcd.js
index 84618ff..a5bbd39 100644
--- a/src/jquery.uls.lcd.js
+++ b/src/jquery.uls.lcd.js
@@ -193,12 +193,20 @@
 		 * @param {number} columnsPerRow How many columns fit in a row.
 		 */
 		renderRegion: function( $region, languages, itemsPerColumn, columnsPerRow ) {
-			var i, lastItem, currentScript, nextScript, force,
+			var columnsClasses, i, lastItem, currentScript, nextScript, force,
 				len = languages.length,
 				items = [],
 				columns = [],
 				rows = [];
 
+			if ( columnsPerRow === 1 ) {
+				columnsClasses = 'twelve columns';
+			} else if ( columnsPerRow < 4 ) {
+				columnsClasses = 'six columns';
+			} else {
+				columnsClasses = 'three columns';
+			}
+
 			for ( i = 0; i < len; i++ ) {
 				force = false;
 				nextScript = $.uls.data.getScriptGroupOfLanguage( languages[i+1] );
@@ -215,7 +223,7 @@
 				items.push( this.renderItem( languages[i] ) );
 
 				if ( items.length >= itemsPerColumn || lastItem || force ) {
-					columns.push( $( '<ul>' ).addClass( 'three columns' ).append( items ) );
+					columns.push( $( '<ul>' ).addClass( columnsClasses ).append( items ) );
 					items = [];
 					if ( columns.length >= columnsPerRow || lastItem ) {
 						rows.push( $( '<div>' ).addClass( 'row uls-language-block' ).append( columns ) );