diff --git a/views_ui_basic.admin.inc b/views_ui_basic.admin.inc
index 62cf4f0..fff70cc 100755
--- a/views_ui_basic.admin.inc
+++ b/views_ui_basic.admin.inc
@@ -8,7 +8,7 @@
  * Admin form
  */
 function views_ui_basic_admin_form() {
-  $form["#prefix"] = '<p>' . t('Use this form to define which Views may be editable by users with the "' . l('edit views basic settings', 'admin/user/permissions').'" permission.') . '</p><p>' . t('Please note that the  "override" button will be hidden, so if your view uses multiple displays, you will probably want to modify the header/footer/empty text/title/etc fields to be "overriden," otherwise it will update the default display when the user goes in and modifies them.') . '</p>';
+  $form["#prefix"] = '<p>' . t('Use this form to define which Views may be editable by users with the "' . l('edit views basic settings', 'admin/people/permissions').'" permission.') . '</p><p>' . t('Please note that the  "override" button will be hidden, so if your view uses multiple displays, you will probably want to modify the header/footer/empty text/title/etc fields to be "overriden," otherwise it will update the default display when the user goes in and modifies them.') . '</p>';
 
   $form['fsfields'] = array(
     '#type'  => 'fieldset',
@@ -30,15 +30,19 @@ function views_ui_basic_admin_form() {
     '#title' => t('Views'),
   );
 
-
   foreach ($views as $view_key => $view_object) {
     if (!isset($view_object->disabled) || !$view_object->disabled) {
-
-      $form['fsviews']["{$view_key}_fieldset"] = array(
-        '#title' => $view_key . ' [' . l(t('edit view'), "admin/build/views/edit/$view_key", array('attributes' => array('target' => '_blank'))) . ']',
-        '#type' => 'fieldset',
-      );
-
+	 if ($view_object->description != "") {
+		  $form['fsviews']["{$view_key}_fieldset"] = array(
+			'#title' => $view_object->description . ' <span style="color:#bbbbbb;font-style:italic">('. $view_key .') </span> | ' . l(t('edit view'), "admin/structure/views/view/$view_key/edit/", array('attributes' => array('target' => '_blank'))),
+			'#type' => 'fieldset',
+			);
+	 } else {
+		  $form['fsviews']["{$view_key}_fieldset"] = array(
+			'#title' => $view_key . ' | ' . l(t('edit view'), "admin/structure/views/view/$view_key/edit/", array('attributes' => array('target' => '_blank'))),
+			'#type' => 'fieldset',
+		);
+	 }
       $options = array();
       foreach ($view_object->display as $display_key => $views_display) {
         $title = $views_display->display_title;
diff --git a/views_ui_basic.module b/views_ui_basic.module
index 2d5d7b6..63b9bdb 100755
--- a/views_ui_basic.module
+++ b/views_ui_basic.module
@@ -170,7 +170,7 @@ function views_ui_basic_preprocess_page(&$vars) {
         $tabs .= theme('menu_local_task', $variables);
       }
     }
-    $vars['tabs'] = "<ul class=\"tabs primary clearfix\">\n". $tabs ."</ul>\n";
+    $vars['tabs'] = '<ul class="tabs primary clearfix">'. $tabs .'</ul>';
   }
 }
 
@@ -378,8 +378,12 @@ function views_ui_basic_list_page() {
 
             $editlink[] = l("$fields[$field]", "views_ui_basic/$view_key/$display_key/$field", array('attributes' => array('title' => $value)));
           }
-
-          $item = "$display_key ($views_display->display_title) Edit: " . implode(' | ', $editlink);
+          $displayname = $views_display->display_options['title'];
+		  if ($displayname != "") {
+			$item = "$displayname ($views_display->display_title) Edit: " . implode(' | ', $editlink);
+          } else {
+			$item = "$display_key ($views_display->display_title) Edit: " . implode(' | ', $editlink);
+          }
 
           $items[$view_key]['children'][$display_key][] = $item;
         }
@@ -391,10 +395,9 @@ function views_ui_basic_list_page() {
     return theme('item_list', array('items' => $items));
   }
   else {
-    return 'No Views configured. Please ' . l('select the views', 'admin/build/views/views_ui_basic') . ' you wish to use.';
-  }
+    return 'No Views configured. Please ' . l('select the views', 'admin/structure/views/views_ui_basic') . ' you wish to use.';
+	}
 }
-
 //
 // Internal helper functions
 //
@@ -518,4 +521,4 @@ function _views_ui_basic_enable_wysiwyg(&$form_element) {
       }
     }
   }
-}
\ No newline at end of file
+}