diff --git a/setup.php b/setup.php
index ee65a0c..bf94e9e 100644
--- a/setup.php
+++ b/setup.php
@@ -231,7 +231,7 @@ function weathermap_config_settings() {
 		),
 		'weathermap_width' => array(
 			'friendly_name' => __('Hover Graph Default Width', 'weathermap'),
-			'description'   => __('The default width of the RRDtool Graphs that appear when you over on a Link.', 'weathermap'),
+			'description'   => __('The default width of the RRDtool Graphs that appear when you hover on a Link.', 'weathermap'),
 			'method'        => 'textbox',
 			'default'       => 400,
 			'size'          => 3,
@@ -239,7 +239,7 @@ function weathermap_config_settings() {
 		),
 		'weathermap_height' => array(
 			'friendly_name' => __('Hover Graph Default Height', 'weathermap'),
-			'description'   => __('The default height of the RRDtool Graphs that appear when you over on a Link.', 'weathermap'),
+			'description'   => __('The default height of the RRDtool Graphs that appear when you hover on a Link.', 'weathermap'),
 			'method'        => 'textbox',
 			'default'       => 125,
 			'size'          => 3,
@@ -247,7 +247,7 @@ function weathermap_config_settings() {
 		),
 		'weathermap_nolegend' => array(
 			'friendly_name' => __('Hover Graph Style', 'weathermap'),
-			'description'   => __('When hovering over the Links or Nodes, what style of Graph would you like displayed?', 'weathermap'),
+			'description'   => __('When hovering over the Links or Nodes, what style of Graph is to be displayed displayed?', 'weathermap'),
 			'method'        => 'drop_array',
 			'array'         => array(
 				'thumb' => __('Thumbnail Graphs', 'weathermap'),
diff --git a/weathermap-cacti-plugin.php b/weathermap-cacti-plugin.php
index 908fd45..257b4b2 100644
--- a/weathermap-cacti-plugin.php
+++ b/weathermap-cacti-plugin.php
@@ -390,9 +390,9 @@ function weathermap_singleview($mapid) {
 
 			if ($is_wm_admin) {
 				$maptitle .= '<span> [ ';
-				$maptitle .= '<a class="pic linkOverDark" href="weathermap-cacti-plugin.php">' . __esc('Return to Main Page', 'weathermap') . '</a> | ';
-				$maptitle .= '<a class="pic linkOverDark" href="weathermap-cacti-plugin-mgmt.php?action=map_settings&id=' . $mapid . '">' . __esc('Map Settings', 'weathermap') . '</a> | ';
-				$maptitle .= '<a class="pic linkOverDark" href="weathermap-cacti-plugin-mgmt.php?action=perms_edit&id=' . $mapid . '">' . __esc('Map Permissions', 'weathermap') . '</a> | ';
+				$maptitle .= '<a class="pic linkOverDark" href="weathermap-cacti-plugin.php">' . __esc('Return to Main Page', 'weathermap') . '</a> ||*---*|| ';
+				$maptitle .= '<a class="pic linkOverDark" href="weathermap-cacti-plugin-mgmt.php?action=map_settings&id=' . $mapid . '">' . __esc('Map Settings', 'weathermap') . '</a> ||*---*|| ';
+				$maptitle .= '<a class="pic linkOverDark" href="weathermap-cacti-plugin-mgmt.php?action=perms_edit&id=' . $mapid . '">' . __esc('Map Permissions', 'weathermap') . '</a> ||*---*|| ';
 				$maptitle .= "<a class='editMap linkOverDark' href='" . html_escape('weathermap-cacti-plugin-editor.php?action=nothing&mapname=' . $map['configfile']) . "'>" . __esc('Edit Map', 'weathermaps') . "</a>";
 				$maptitle .= ' ] </span>';
 			} else {
@@ -716,9 +716,9 @@ function weathermap_versionbox() {
 		$pagefoot = __('Powered by %s PHP Weathermap Version %s %s', '<a href="http://www.network-weathermap.com/?v=' . $weathermap_version . '">', $weathermap_version, '</a>', 'weathermap');
 
 		if (api_plugin_user_realm_auth('weathermap-cacti-plugin-mgmt.php')) {
-			$pagefoot .= ' --- <a href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin-mgmt.php" title="' . __esc('Go to the map management page', 'weathermap') . '">' . __('Weathermap Management', 'weathermap') . '</a>';
-			$pagefoot .= ' | <a target="_blank" href="docs/">' . __('Local Documentation', 'weathermap') . '</a>';
-			$pagefoot .= ' | <a class="pic" href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin-mgmt.php?action=addmap_picker">' . __('New Map', 'weathermap') . '</a>';
+			$pagefoot .= ' ||*---*|| <a href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin-mgmt.php" title="' . __esc('Go to the map management page', 'weathermap') . '">' . __('Weathermap Management', 'weathermap') . '</a>';
+			$pagefoot .= ' ||*---*|| <a target="_blank" href="docs/">' . __('Local Documentation', 'weathermap') . '</a>';
+			$pagefoot .= ' ||*---*|| <a class="pic" href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin-mgmt.php?action=addmap_picker">' . __('New Map', 'weathermap') . '</a>';
 		}
 
 		print '<br/><table width="100%" style="background-color: #f5f5f5; border: 1px solid #bbbbbb;" align="center" cellpadding="1">';