diff --git a/feeds/handler.go b/feeds/handler.go
index 318febf..780674d 100644
--- a/feeds/handler.go
+++ b/feeds/handler.go
@@ -30,7 +30,7 @@ func (h *Handler) RegisterRoutes(router *gin.RouterGroup) {
 		feeds.DELETE("/:id", h.handleDeleteFeed)
 		feeds.POST("/:id/refresh", h.handleRefreshFeed)
 		feeds.POST("/refresh", h.handleRefreshAllFeeds)
-		feeds.POST("/import/opml", h.handleImportOPML)
+		feeds.POST("/import", h.handleImportOPML)
 
 		// Entry routes
 		feeds.GET("/entries", h.handleListEntries)
diff --git a/frontend/src/routes/notes/[id]/+page.svelte b/frontend/src/routes/notes/[id]/+page.svelte
index 63b6d43..e3f28b4 100644
--- a/frontend/src/routes/notes/[id]/+page.svelte
+++ b/frontend/src/routes/notes/[id]/+page.svelte
@@ -64,6 +64,26 @@
 						<h1 class="title">{note.title}</h1>
 					</div>
 				</div>
+				<div class="level-right">
+					<div class="level-item">
+						<div class="buttons">
+							<a href="/" class="button">
+								<span class="icon">
+									<i class="fas fa-arrow-left"></i>
+								</span>
+								<span>Back to Notes</span>
+							</a>
+							{#if !isEditing}
+								<button class="button is-primary" onclick={() => (isEditing = true)}>
+									<span class="icon">
+										<i class="fas fa-edit"></i>
+									</span>
+									<span>Edit</span>
+								</button>
+							{/if}
+						</div>
+					</div>
+				</div>
 			</div>
 			{#if isEditing}
 				<div class="field">
@@ -102,11 +122,6 @@
 						<!-- eslint-disable-next-line svelte/no-at-html-tags -->
 						{@html html}
 					{/await}
-					<div class="field is-grouped mt-4">
-						<div class="control">
-							<button class="button is-primary" onclick={() => (isEditing = true)}>Edit</button>
-						</div>
-					</div>
 				</div>
 			{/if}