diff --git a/scenes/main.gd b/scenes/main.gd
index 945ba75..15c8b7b 100644
--- a/scenes/main.gd
+++ b/scenes/main.gd
@@ -99,6 +99,9 @@ func load_level(level_id):
 	yield(t, "timeout")
 	AudioServer.set_bus_mute(AudioServer.get_bus_index("Master"), false)
 	# FIXME: Need to clean these up when switching levels somehow.
+	
+	chapter_select.select(current_chapter)
+	level_select.select(current_level)
 
 func reload_level():
 	levels.reload()
@@ -119,7 +122,7 @@ func repopulate_levels():
 	levels.reload()
 	level_select.clear()
 	for level in levels.chapters[current_chapter].levels:
-		level_select.add_item(level.slug)
+		level_select.add_item(level.title)
 	level_select.select(current_level)
 
 func repopulate_chapters():
diff --git a/scenes/node.gd b/scenes/node.gd
index 7856fb7..64d2022 100644
--- a/scenes/node.gd
+++ b/scenes/node.gd
@@ -73,6 +73,7 @@ func type_set(new_type):
 		file_browser.title = "Commit"
 	if type != "ref":
 		$ID.text = $ID.text.substr(0,8)
+	z_index = -1
 	match new_type:
 		"blob":
 			$Sprite.texture = preload("res://nodes/blob.svg")
@@ -88,7 +89,7 @@ func type_set(new_type):
 		"head":
 			$Sprite.texture = preload("res://nodes/head.svg")
 			id_always_visible = false
-			z_index = 1
+			z_index = 0
 	if id_always_visible:
 		$ID.show()