diff --git a/index.pl b/index.pl
index 6405c87..1220a02 100755
--- a/index.pl
+++ b/index.pl
@@ -133,7 +133,8 @@ sub header {
 		undef,
 		{attribute=>'http-equiv', value=>'Content-Type'},
 		{attribute=>'content', value=>'text/html; charset=utf-8'});
-	$header .= html_tag('title',$site_name);
+	my $page = (split("/",$request[4]))[-1];
+	$header .= html_tag('title',$site_name . $page ne "" ? " - ".$page : "");
 	$header .= include(@header_includes);
 	$header .= html_tag(
 		'meta',
@@ -176,7 +177,6 @@ sub get_page {
 		open(PAGE, "<", $pages_dir.$sub_page_name) or return page404($pageURL." we looked here:".$pages_dir.$sub_page_name);
 		my @content = <PAGE>;
 		close(PAGE);
-		$site_name .= " - ".$page_name;
 		return @content;
 	}
 }
@@ -232,14 +232,11 @@ sub menu {
 		while (my $file = readdir($dir)) {
 			next if ($file =~ m/^\./);
 			next if ($file =~ m/_dir$/);
-			push (@{$menus{$current_page}}, $file);
+			push (@{$menus{$current_page}}, $current_page."_dir/".$file);
 		}
 		close($dir);
 	}
 	my $buffer = "";
-	# main needs to be output first then the rest of the menus can be looped through
-	$buffer .= render_menu("menu",@{$menus{"menu"}});
-	delete($menus{"menu"});
 	for my $menu_name (sort keys %menus) {
 		$buffer .= render_menu($menu_name,@{$menus{$menu_name}});
 	}