diff --git a/static/koboldai.js b/static/koboldai.js
index af058207..a0b27643 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -74,8 +74,8 @@ const on_colab = $el("#on_colab").textContent == "true";
 var finder_actions = [
 	{name: "Load Model", icon: "folder_open", type: "action", func: function() { socket.emit('load_model_button', {}); }},
 	{name: "New Story", icon: "description", type: "action", func: function() { socket.emit('new_story', ''); }},
-	{name: "Load Story", icon: "folder_open", type: "action", func: function() { socket.emit('load_story_list', ''); }},
-	{name: "Save Story", icon: "save", type: "action", func: function() { socket.emit("save_story", null, (response) => {save_as_story(response);}); }},
+	{name: "Load Story", icon: "folder_open", type: "action", func: load_story_list},
+	{name: "Save Story", icon: "save", type: "action", func: save_story},
 	{name: "Download Story", icon: "file_download", type: "action", func: function() { document.getElementById('download_iframe').src = 'json'; }},
 	{name: "Import Story", icon: "file_download", desc: "Import a prompt from aetherroom.club, formerly prompts.aidg.club", type: "action", func: openClubImport },
 
@@ -119,6 +119,7 @@ const context_menu_actions = {
 	"generated-image": [
 		{label: "View", icon: "search", enabledOn: "ALWAYS", click: imgGenView},
 		{label: "Download", icon: "download", enabledOn: "ALWAYS", click: imgGenDownload},
+		{label: "Retry", icon: "refresh", enabledOn: "ALWAYS", click: imgGenRetry},
 		{label: "Clear", icon: "clear", enabledOn: "ALWAYS", click: imgGenClear},
 	],
 	"wi-img-upload-button": [
@@ -129,8 +130,8 @@ const context_menu_actions = {
 
 // CTRL-[X]
 const shortcuts = [
-	{key: "k", desc: "Finder", func: open_finder},
-	{key: "/", desc: "Help screen", func: () => openPopup("shortcuts-popup")},
+	{key: "s", desc: "Save Story", func: save_story},
+	{key: "o", desc: "Open Story", func: load_story_list},
 	{key: "z", desc: "Undoes last story action", func: () => socket.emit("back", {}), criteria: canNavigateStoryHistory},
 	{key: "y", desc: "Redoes last story action", func: () => socket.emit("redo", {}), criteria: canNavigateStoryHistory},
 	{key: "e", desc: "Retries last story action", func: () => socket.emit("retry", {}), criteria: canNavigateStoryHistory},
@@ -138,6 +139,8 @@ const shortcuts = [
 	{key: "u", desc: "Focuses Author's Note", func: () => focusEl("#authors_notes")}, // CTRL-N is reserved :^(
 	{key: "g", desc: "Focuses game text", func: () => focusEl("#input_text")},
 	{key: "l", desc: '"Lock" screen (Not secure)', func: () => socket.emit("privacy_mode", {'enabled': true})},
+	{key: "k", desc: "Finder", func: open_finder},
+	{key: "/", desc: "Help screen", func: () => openPopup("shortcuts-popup")},
 ]
 
 const chat = {
@@ -651,6 +654,9 @@ function do_probabilities(action) {
 	
 }
 
+function save_story() { socket.emit("save_story", null, response => save_as_story(response)); }
+function load_story_list() { socket.emit("load_story_list", ""); }
+
 function do_presets(data) {
 	for (select of document.getElementsByClassName('presets')) {
 		//clear out the preset list
@@ -4613,6 +4619,7 @@ async function loadKoboldJSON(data, filename) {
 			upload_no_save: true
 		});
 		socket.emit("load_story_list", "");
+		load_story_list();
 	} else if (data.folders !== undefined && data.entries !== undefined) {
 		// World Info Folder
 		await postWI(data);
@@ -5480,6 +5487,8 @@ process_cookies();
 			return;
 		}
 
+		if (finder_mode !== "ui") return;
+
 		const actionsCount = actions.length;
 		let future = finder_selection_index + delta;
 
@@ -6439,4 +6448,11 @@ function imgGenClear() {
 	const container = $el("#action\\ image");
 	container.removeAttribute("tooltip");
 	socket.emit("clear_generated_image", {});
+}
+
+function imgGenRetry() {
+	const image = $el(".action_image");
+	if (!image) return;
+	$el("#image-loading").classList.remove("hidden");
+	socket.emit("retry_generated_image", {});
 }
\ No newline at end of file
diff --git a/templates/settings flyout.html b/templates/settings flyout.html
index 67678d0b..bb70db41 100644
--- a/templates/settings flyout.html	
+++ b/templates/settings flyout.html	
@@ -71,11 +71,11 @@
 						<span class="material-icons-outlined cursor" tooltip="New Story">description</span>
 						<span class="button_label">New Story</span>
 					</button>
-					<button class="settings_button" onclick="socket.emit('load_story_list', '');">
+					<button class="settings_button" onclick="load_story_list();">
 						<span class="material-icons-outlined cursor" tooltip="Load Story">folder_open</span>
 						<span class="button_label">Load Story</span>
 					</button>
-					<button class="settings_button var_sync_alt_story_gamesaved" onclick='socket.emit("save_story", null, (response) => {save_as_story(response);});'>
+					<button class="settings_button var_sync_alt_story_gamesaved" onclick='save_story();'>
 						<span class="material-icons-outlined cursor var_sync_alt_story_gamesaved" tooltip="Save Story">save</span>
 						<span class="button_label">Save Story</span>
 					</button>