diff --git a/user_badges.admin.inc b/user_badges.admin.inc
index 7713e19..ee303ba 100644
--- a/user_badges.admin.inc
+++ b/user_badges.admin.inc
@@ -55,7 +55,7 @@ function user_badges_badgelist_form($form, &$form_state) {
 
   // Build a table listing the appropriate badges.
   foreach ($result as $badge) {
-    $badge->class = 'badge badge-$badge->bid' . drupal_html_class($badge->name);
+    $badge->class = 'badge badge-' . $badge->bid . ' ' . drupal_html_class($badge->name);
 
     $form['name'][$badge->bid] = array('#value' => check_plain($badge->name));
 
@@ -158,6 +158,9 @@ function theme_user_badges_badgelist_form($variables) {
   $form = $variables['form'];
   $output = '';
 
+  // Create the rows array for the table theme.
+  $rows = array();
+  
   // Loop through the array items in the name array to get all the bids for our listed badges.
   if (isset($form['name']) && is_array($form['name'])) {
     foreach (element_children($form['name']) as $key) {
@@ -165,39 +168,29 @@ function theme_user_badges_badgelist_form($variables) {
       if (!is_numeric($key)) {
         continue;
       }
-
-      // Create the rows array for the table theme.
-      $row = array();
-      $row[] = $form['name'][$key]['#value'];
-      $row[] = $form['badge'][$key]['#value'];
-      $row[] = $form['weight'][$key]['#value'];
-      $row[] = $form['options'][$key]['#value'];
+      
+      // Create and populate each row.
+      $row = array(
+        'name' => $form['name'][$key]['#value'],
+        'badge' => $form['badge'][$key]['#value'],
+        'weight' => $form['weight'][$key]['#value'],
+        'options' => $form['options'][$key]['#value'],
+      );
       if (variable_get('user_badges_list_show_users', 0)) {
-        $row[] = $form['users'][$key]['#value'];
+        $row['users'] = $form['users'][$key]['#value'];
       }
-      $row[] = $form['edit'][$key]['#value'];
-      $row[] = $form['delete'][$key]['#value'];
+      $row['edit'] = $form['edit'][$key]['#value'];
+      $row['delete'] = $form['delete'][$key]['#value'];
+      
+      // Add the row to the list of rows.
       $rows[] = $row;
     }
 
-    // Add the submit button.
-    $rows[] = array(
-      array(
-        'data' => drupal_render($form['submit']),
-        'align' => 'center',
-        'colspan' => '20',
-      ),
-    );
-  }
-  else {
-    $rows[] = array(array(
-        'data' => t('No badges available.'),
-        'colspan' => '5',
-      ));
   }
 
   // Theme all that we have processed so far into a table.
-  $output .= theme('table', array('header' => $form['#header'], 'rows' => $rows));
+  $msg = t('No badges available.');
+  $output .= theme('table', array('header' => $form['#header'], 'rows' => $rows, 'empty' => $msg));
 
   // Create the table's pager.
   if ($form['pager']['#value']) {
@@ -386,6 +379,7 @@ function user_badges_edit_form($form, $form_state, $bid = NULL) {
       '#description' => t('If you have not entered an image URL above, you can select an image from this user badges image library to associate with this badge. You can upload additional images to the library under the <a href="@url">images</a> tab.', array('@url' => url(BASE_ADMIN_PATH . '/images'))),
       '#weight' => 10,
       );
+      _user_badges_add_image_css();
   }
   else {
     $form['noimages'] = array(
@@ -513,6 +507,8 @@ function user_badges_images_form($form, $form_state) {
       '#value' => t('Delete'),
     );
   }
+  
+  _user_badges_add_image_css();
   return $form;
 }
 
@@ -639,7 +635,7 @@ function user_badges_roles_form($form, &$form_state) {
   );
   $form['blocked'][0] = array(
     '#type' => 'textfield',
-    '#title' => t('blocked user'),
+    '#title' => t('Blocked User'),
     '#size' => 40,
     '#maxlength' => 255,
     '#autocomplete_path' => 'user_badges/autocomplete',
@@ -658,7 +654,7 @@ function user_badges_roles_form($form, &$form_state) {
   foreach ($roles as $rid => $role) {
     $form['roles'][$rid] = array(
       '#type' => 'textfield',
-      '#title' => check_plain($role),
+      '#title' => ucwords(check_plain($role)),
       '#maxlength' => 255,
       '#autocomplete_path' => 'user_badges/autocomplete',
       '#default_value' => isset($badges[$rid]) ? $badges[$rid]->name . ' '
@@ -890,6 +886,23 @@ function user_badges_settings_form_submit($form, $form_state) {
 }
 
 /**
+ * Adds CSS to images so that they lay out horizontally.
+ *
+ * @return
+ *   null
+ */
+function _user_badges_add_image_css() {
+  // Add CSS to float the images.
+  $css = 'div.form-type-checkbox, div.form-type-radio {border: 1px #cdcdcd solid; padding: 12px;-moz-border-radius: 20px; -webkit-border-radius: 20px; border-radius: 20px; display: inline-block;} ';
+  $css .= 'div.form-type-checkbox input {display: inline;}';
+  $css .= 'div.form-type-checkbox .description {display: block;}';
+  $options = array(
+    'type' => 'inline',
+  );
+  drupal_add_css($css, $options);
+}
+
+/**
  * Select options for displaying a list of images in the image library.
  *
  * @return
diff --git a/user_badges.module b/user_badges.module
index 2b6ded0..014a055 100644
--- a/user_badges.module
+++ b/user_badges.module
@@ -107,6 +107,7 @@ function user_badges_menu() {
 
   $items[BASE_ADMIN_PATH] = array(
     'title' => 'Badges',
+    'description' => t('Configure badge settings, including adding new badges and managing roles.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_badgelist_form'),
     'access arguments' => array('manage badges'),
@@ -115,6 +116,7 @@ function user_badges_menu() {
 
   $items[BASE_ADMIN_PATH . '/list'] = array(
     'title' => 'List',
+    'description' => t('List all badges.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_badgelist_form'),
     'access arguments' => array('manage badges'),
@@ -125,6 +127,7 @@ function user_badges_menu() {
 
   $items[BASE_ADMIN_PATH . '/add'] = array(
     'title' => 'Add new badge',
+    'description' => t('Add a new badge'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_edit_form'),
     'access arguments' => array('manage badges'),
@@ -134,6 +137,7 @@ function user_badges_menu() {
 
   $items[BASE_ADMIN_PATH . '/images'] = array(
     'title' => 'Images',
+    'description' => t('List all available images.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_images_form'),
     'access arguments' => array('manage badges'),
@@ -143,6 +147,7 @@ function user_badges_menu() {
 
   $items[BASE_ADMIN_PATH . '/roles'] = array(
     'title' => 'Roles',
+    'description' => t('List user roles.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_badges_roles_form'),
     'access arguments' => array('manage badges'),
@@ -582,7 +587,7 @@ function user_badges_badge_autocomplete($string = '') {
     $trimstring = trim($searchstring[0]);
 
     $result = db_select('user_badges_badges', 'ubb')
-      ->fields('ubb', array('bid', 'name'))
+      ->fields('ubb', array('bid', 'name', 'image'))
       ->condition('name', '%' . db_like($trimstring) . '%', 'LIKE')
       ->orderBy('weight')
       ->orderBy('name')
@@ -592,10 +597,9 @@ function user_badges_badge_autocomplete($string = '') {
 
     foreach ($result as $badge) {
       $matches[$badge->name . ' (' . t('Badge ID') . ' ' . $badge->bid . ')'] =
-        check_plain($badge->name) . ' ' . theme('user_badge', array('badge' => $badge));
+        check_plain($badge->name) . ' ' . _user_badges_build_image($badge);
     }
   }
-
   drupal_json_output($matches);
 }
 
@@ -995,11 +999,11 @@ function user_badges_get_badges($uid, $options = array()) {
       if ($limit != 0 || $badge->unhideable == 1) {
         if ($uid == 'select') {
           $badges[$uid][$badge->bid] = $badge->name;
-          $badges[$badge->bid]['#attributes'] = array('class' => "badge badge-$badge->bid " . drupal_html_class($badge->name));
+          $badges[$badge->bid]['#attributes'] = array('class' => 'badge badge-' . $badge->bid . ' ' . drupal_html_class($badge->name));
         }
         else {
           $badges[$uid][$badge->bid] = $badge;
-          $badges[$uid][$badge->bid]->class = "badge badge-$badge->bid " . drupal_html_class($badge->name);
+          $badges[$uid][$badge->bid]->class = 'badge badge-' . $badge->bid . ' ' . drupal_html_class($badge->name);
         }
         //Count down our limit, unless the badge doesn't count towards it
         if (!$badge->doesnotcounttolimit) {
@@ -1328,18 +1332,18 @@ function _user_badges_build_image($badge) {
   $alt = check_plain($badge->name);
 
   if (!isset($badge->class)) {
-    $badge->class = "badge badge-$badge->bid " . drupal_html_class($badge->name);
+    $badge->class = 'badge badge-' . $badge->bid . ' ' . drupal_html_class($badge->name);
   }
 
-  $variables = array(
-    'style_name' => $style_name,
+  $image = array(
     'path' => $badge->image,
     'alt' => $alt,
     'title' => $alt,
-    'attributes' => array('class' => $badge->class),
-    );
-  $theme = $style_name ? 'image_style' : 'image';
-  $image = theme($theme, $variables);
+    'attributes' => array(
+      'class' => array($style_name, $badge->class),
+    ),
+  );
+  $image = theme_image($image);
 
   return $image;
 }
@@ -1358,7 +1362,7 @@ function theme_user_badge($variables) {
   }
 
   if (!isset($badge->class)) {
-    $badge->class = "badge badge-$badge->bid " . drupal_html_class($badge->name);
+    $badge->class = 'badge badge-' . $badge->bid . ' ' . drupal_html_class($badge->name);
   }
 
   $image = _user_badges_build_image($badge);