diff --git a/static/css/supporter_layout.css b/static/css/supporter_layout.css
index 45e22810..bca691ec 100644
--- a/static/css/supporter_layout.css
+++ b/static/css/supporter_layout.css
@@ -273,7 +273,7 @@ input.profile-save {
   display: inline-block;
   vertical-align: middle;
 }
-#loadgr input {
+#loadgr div, #loadgr input {
   margin: auto 10px auto 36px;
 }
 #loadgr #goodreads_shelves {
diff --git a/static/js/import_books.js b/static/js/import_books.js
index 57712075..a45f0ac2 100644
--- a/static/js/import_books.js
+++ b/static/js/import_books.js
@@ -28,10 +28,19 @@ jQuery(document).ready(function($) {
                 // say waiting
                 $('#goodreads_input').attr('value', 'Loading....');
                 var sel = $('<select id="id_goodreads_shelf_name_number" name="goodreads_shelf_name_number"></select>').appendTo('#goodreads_shelves');
-                $('<option value="' + 'all:' + json.total_book_count + '">' + 'all (' + json.total_book_count +')' + '</option>').appendTo(sel);
+                if (json.total_book_count === 1) {
+	                $('<option value="' + 'all:' + json.total_book_count + '">' + 'all (' + json.total_book_count +' book)' + '</option>').appendTo(sel);
+	            } else {
+	                $('<option value="' + 'all:' + json.total_book_count + '">' + 'all (' + json.total_book_count +' books)' + '</option>').appendTo(sel);
+	            }
                 for (var i = 0; i < json.user_shelves.length; i++) {
-                    $('<option value="' + json.user_shelves[i].name + ':' + json.user_shelves[i].book_count + '">' + json.user_shelves[i].name +
-                         ' (' + json.user_shelves[i].book_count + ')' + '</option>').appendTo(sel);
+                	if (json.user_shelves[i].book_count === 1) {
+	                    $('<option value="' + json.user_shelves[i].name + ':' + json.user_shelves[i].book_count + '">' + json.user_shelves[i].name +
+    	                     ' (' + json.user_shelves[i].book_count + ' book)' + '</option>').appendTo(sel);
+    	            } else {
+	                    $('<option value="' + json.user_shelves[i].name + ':' + json.user_shelves[i].book_count + '">' + json.user_shelves[i].name +
+    	                     ' (' + json.user_shelves[i].book_count + ' books)' + '</option>').appendTo(sel);
+    	            }
                 }
                 $('#load_gr_shelves_list').attr('id','load_shelf_form');
                 $('#goodreads_input').attr('value', 'Add this shelf');
diff --git a/static/less/supporter_layout.less b/static/less/supporter_layout.less
index 173129ae..7c30e055 100644
--- a/static/less/supporter_layout.less
+++ b/static/less/supporter_layout.less
@@ -200,7 +200,7 @@ input.profile-save {
 		vertical-align: middle;
 	}
 	
-	input {
+	div, input {
 		margin: auto 10px auto 36px;
 	}