diff --git superfish.info superfish.info
index 6a5c692..558a3f0 100644
--- superfish.info
+++ superfish.info
@@ -5,4 +5,4 @@ dependencies[] = menu
 core = "7.x"
 files[] = superfish.module
 files[] = superfish.admin.inc
-configure = admin/settings/superfish
\ No newline at end of file
+configure = admin/config/user-interface/superfish
\ No newline at end of file
diff --git superfish.module superfish.module
index 7d0b3e3..7e55e68 100644
--- superfish.module
+++ superfish.module
@@ -12,7 +12,7 @@
  * Implements hook_menu().
  */
 function superfish_menu() {
-  $items['admin/settings/superfish'] = array(
+  $items['admin/config/user-interface/superfish'] = array(
     'title' => 'Superfish',
     'description' => 'Configure Superfish Menus',
     'page callback' => 'drupal_get_form',
@@ -29,10 +29,10 @@ function superfish_menu() {
 function superfish_help($path, $arg) {
   $output = '';
   switch ($path) {
-    case 'admin/settings/modules#description':
+    case 'admin/modules#description':
     $output .= t('Superfish adds jQuery Superfish plugin to your menus.');
     break;
-  case 'admin/settings/superfish':
+  case 'admin/config/user-interface/superfish':
     $output .= t('<p>Block-specific Superfish settings could be found at !link</p>', array('!link' => l('admin/structure/block', 'admin/structure/block')));
     break;
   }
@@ -318,7 +318,7 @@ function superfish_contents($delta = 0) {
   $pathclass = ($type == 'navbar') ? "\n pathClass: 'active-trail'," : '';
 
   if ($style != 'default') {
-    drupal_add_css(drupal_get_path('module', 'superfish') . '/css/extra/' . $style . ' .css');
+    drupal_add_css(drupal_get_path('module', 'superfish') . '/css/extra/' . $style . '.css');
   }
 
   $animation = ($slide == 'true') ? "animation: {opacity:'show',height:'show'}," : '';
@@ -492,10 +492,12 @@ function theme_superfish_build($variables) {
     if ($menu_item['link']['hidden'] == 0) {
       $class = array();
       $mlid = $menu_item['link']['mlid'];
-      $class[] = ($trail && in_array($mlid, $trail)) ? 'active-trail' : '';
+      if ($trail && in_array($mlid, $trail)) {
+	$class[] = 'active-trail';
+      }
 
-      // If enabaled, no single menu item gets first\last classes
-      $firstlast = ($dfirstlast == 1 && $num_items == 1) ? 0 : '';
+      // If enabled, no single menu item gets first\last classes
+      $firstlast = ($dfirstlast == 1 && $num_items == 1) ? 0 : $firstlast;
 
       // Adding first\middle\last classes
       if ($firstlast == 1) {
@@ -512,13 +514,17 @@ function theme_superfish_build($variables) {
       }
 
       // If enabled, no single menu item gets zebra striping
-      $zebra = ($dzebra == 1 && $num_items == 1) ? 0 : '';
+      $zebra = ($dzebra == 1 && $num_items == 1) ? 0 : $zebra;
 
       // Adding zebra striping
-      $class[] = ($zebra == 1) ? ($i % 2) ? 'odd' : 'even' : '';
+      if ($zebra == 1) {
+	$class[] = ($i % 2) ? 'odd' : 'even';
+      }
 
       // Adding item count class
-      $class[] = ($count == 1) ? 'sf-item-' . $i : '';
+      if ($count == 1) {
+	$class[] = "sf-item-$i";
+      }
       $i++;
 
       $class = implode(' ', $class);