diff --git a/kulfi/src/tauri.rs b/kulfi/src/tauri.rs
index 134c679..d8d24a9 100644
--- a/kulfi/src/tauri.rs
+++ b/kulfi/src/tauri.rs
@@ -1,82 +1,20 @@
-const BROWSER_WEBVIEW: &str = "browser_view";
-const NAV_WEBVIEW: &str = "navigation";
-
 #[allow(unexpected_cfgs)]
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn ui() -> eyre::Result<()> {
-    const BROWSER_INIT_SCRIPT: &str = r#"
-        console.log("Browser Init Script Loaded");
-
-        const listen = window.__TAURI__.event.listen;
-        const emitTo = window.__TAURI__.event.emitTo;
-
-        // https://developer.mozilla.org/en-US/docs/Web/API/Window/pageshow_event
-        window.addEventListener("pageshow", () => {
-            console.info("Page show event triggered");
-            emitUrlChange(window.location.href);
-        });
-
-        listen("nav-back", () => {
-            console.log("going back one page");
-            history.back();
-        });
-
-        listen("nav-forward", () => {
-            console.log("going forward one page");
-            history.forward();
-        });
-
-
-        /**
-         * @param {string} url
-         */
-        function emitUrlChange(url) {
-            console.log("Current URL:", url);
-            if (url.startsWith("tauri://")) {
-                console.info("URL starts with tauri://, ignoring emitUrlChange");
-                return;
-            }
-
-            emitTo("navigation", "url-changed", url).
-              then(() => {
-                console.log("URL change emitted to navigation webview");
-              })
-              .catch(err => {
-                console.error("Failed to emit URL change:", err);
-              });
-        }
-    "#;
-
     tauri::Builder::default()
         .plugin(tauri_plugin_opener::init())
         .setup(|app| {
-            use tauri::{LogicalPosition, LogicalSize, WebviewUrl};
-
-            let width = 800.0;
-            let height = 600.0;
-            let bottom_height = 45.0;
-            let top_height = height - bottom_height;
-
-            let window = tauri::window::WindowBuilder::new(app, "main")
-                .title("Kulfi")
-                .center()
-                .inner_size(width, height)
-                .build()?;
-
-            let _browser_window = window.add_child(
-                tauri::webview::WebviewBuilder::new(BROWSER_WEBVIEW, tauri::WebviewUrl::App("init_view.html".into()))
-                    .auto_resize()
-                    .initialization_script(BROWSER_INIT_SCRIPT),
-                LogicalPosition::new(0., 0.),
-                LogicalSize::new(width, top_height), // TODO:
-            )?;
-
-            let _webview2 = window.add_child(
-                tauri::webview::WebviewBuilder::new(NAV_WEBVIEW, WebviewUrl::App("navigation.html".into()))
-                    .auto_resize(),
-                LogicalPosition::new(0., top_height),
-                LogicalSize::new(width, bottom_height), // TODO:
-            )?;
+            use tauri::WebviewUrl;
+
+            let _window = tauri::WebviewWindowBuilder::new(
+                app,
+                "main",
+                WebviewUrl::App("browser.html".into()),
+            )
+            .title("Kulfi")
+            .center()
+            .inner_size(800.0, 600.0)
+            .build()?;
 
             Ok(())
         })
@@ -159,37 +97,12 @@ pub fn ui() -> eyre::Result<()> {
                 }
             });
         })
-        .invoke_handler(tauri::generate_handler![open_url])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 
     Ok(())
 }
 
-/// Called from `navigation.html` frontend when the user enters a kulfi url and hits the enter key
-#[tauri::command]
-async fn open_url(app_handle: tauri::AppHandle, url: String) -> Result<(), OpenUrlError> {
-    use tauri::Manager;
-
-    tracing::info!("{:?}", app_handle.webviews().get("browser_view"));
-
-    app_handle
-        .get_webview(BROWSER_WEBVIEW)
-        .ok_or(OpenUrlError::NoWebview)?
-        .navigate(url.parse().map_err(|_| OpenUrlError::InvalidUrl)?)
-        .map_err(|_| OpenUrlError::Navigation)
-}
-
-#[derive(Debug, thiserror::Error, serde::Serialize)]
-enum OpenUrlError {
-    #[error("No webview found to open the URL")]
-    NoWebview,
-    #[error("Invalid URL provided")]
-    InvalidUrl,
-    #[error("Failed to navigate to the URL")]
-    Navigation,
-}
-
 fn kulfi_uri_to_path_and_id52(uri: &hyper::Uri) -> (String, String) {
     // TODO: handle the following assert as error
     let uri_str = uri.to_string();
diff --git a/kulfi/static/browser.html b/kulfi/static/browser.html
new file mode 100644
index 0000000..76497ae
--- /dev/null
+++ b/kulfi/static/browser.html
@@ -0,0 +1,314 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Kulfi Browser</title>
+    <style>
+        * {
+            box-sizing: border-box;
+        }
+
+        body, html {
+            margin: 0;
+            padding: 0;
+            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+        }
+
+        #container {
+            display: flex;
+            flex-direction: column;
+            height: 100%;
+            width: 100%;
+        }
+
+        #navbar {
+            display: flex;
+            flex-direction: column;
+            padding: 6px 8px;
+            background-color: #f5f5f5;
+            border-bottom: 1px solid #ddd;
+            gap: 4px;
+            flex-shrink: 0;
+        }
+
+        #navbar-row {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            gap: 4px;
+        }
+
+        #navbar-row button {
+            height: 32px;
+            width: 32px;
+            padding: 4px;
+            border: none;
+            background: transparent;
+            border-radius: 4px;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        #navbar-row button:hover {
+            background-color: #e0e0e0;
+        }
+
+        #navbar-row button:active {
+            background-color: #d0d0d0;
+        }
+
+        #navbar-row button svg {
+            width: 20px;
+            height: 20px;
+            fill: #333;
+        }
+
+        #url {
+            flex: 1;
+            height: 32px;
+            font-size: 14px;
+            padding: 0 10px;
+            border: 1px solid #ccc;
+            border-radius: 16px;
+            background-color: #fff;
+            outline: none;
+        }
+
+        #url:focus {
+            border-color: #007aff;
+        }
+
+        #go-btn {
+            width: auto !important;
+            padding: 0 12px !important;
+            font-size: 14px;
+            color: #007aff;
+            font-weight: 500;
+        }
+
+        #status {
+            font-size: 12px;
+            color: #666;
+            padding-left: 68px; /* align with URL input (back + forward + gaps) */
+            min-height: 16px;
+        }
+
+        #status:empty {
+            display: none;
+        }
+
+        #status.error {
+            color: #d32f2f;
+        }
+
+        #content {
+            flex: 1;
+            width: 100%;
+            border: none;
+            background: #fff;
+        }
+
+        #welcome {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            color: #666;
+        }
+
+        #welcome h1 {
+            font-size: 24px;
+            font-weight: 500;
+            margin-bottom: 8px;
+        }
+
+        #welcome p {
+            font-size: 14px;
+            color: #999;
+        }
+
+        .hidden {
+            display: none !important;
+        }
+    </style>
+</head>
+<body>
+    <div id="container">
+        <nav id="navbar">
+            <div id="navbar-row">
+                <button id="back" title="Back">
+                    <svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M165.66,202.34a8,8,0,0,1-11.32,11.32l-80-80a8,8,0,0,1,0-11.32l80-80a8,8,0,0,1,11.32,11.32L91.31,128Z"></path>
+                    </svg>
+                </button>
+                <button id="forward" title="Forward">
+                    <svg viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M181.66,133.66l-80,80a8,8,0,0,1-11.32-11.32L164.69,128,90.34,53.66a8,8,0,0,1,11.32-11.32l80,80A8,8,0,0,1,181.66,133.66Z"></path>
+                    </svg>
+                </button>
+                <input id="url" placeholder="Enter kulfi:// URL or ID52" type="text" />
+                <button id="go-btn" title="Go">Go</button>
+            </div>
+            <div id="status"></div>
+        </nav>
+
+        <div id="welcome">
+            <h1>Kulfi Browser</h1>
+            <p>Enter a kulfi:// URL or ID52 above and press Enter</p>
+        </div>
+
+        <iframe id="content" class="hidden"></iframe>
+    </div>
+
+    <script>
+        const urlInput = document.getElementById("url");
+        const status = document.getElementById("status");
+        const content = document.getElementById("content");
+        const welcome = document.getElementById("welcome");
+        const backBtn = document.getElementById("back");
+        const forwardBtn = document.getElementById("forward");
+        const goBtn = document.getElementById("go-btn");
+
+        function showStatus(msg, isError = false) {
+            status.textContent = msg;
+            status.classList.toggle("error", isError);
+        }
+
+        function clearStatus() {
+            status.textContent = "";
+            status.classList.remove("error");
+        }
+
+        // Navigation history for kulfi:// URLs (iframe doesn't track these well)
+        let historyStack = [];
+        let historyIndex = -1;
+
+        urlInput.addEventListener("keydown", function(event) {
+            if (event.key === "Enter") {
+                goToUrl();
+            }
+        });
+
+        goBtn.addEventListener("click", goToUrl);
+
+        backBtn.addEventListener("click", () => {
+            if (historyIndex > 0) {
+                historyIndex--;
+                navigateToHistoryEntry();
+            }
+        });
+
+        forwardBtn.addEventListener("click", () => {
+            if (historyIndex < historyStack.length - 1) {
+                historyIndex++;
+                navigateToHistoryEntry();
+            }
+        });
+
+        function navigateToHistoryEntry() {
+            const url = historyStack[historyIndex];
+            urlInput.value = url;
+            loadUrl(url, false); // Don't add to history when navigating history
+        }
+
+        function goToUrl() {
+            clearStatus();
+            let url = urlInput.value.trim();
+
+            const result = validate(url);
+
+            if (result.error) {
+                showStatus(result.error, true);
+                return;
+            }
+
+            loadUrl(result.url, true);
+        }
+
+        function loadUrl(url, addToHistory) {
+            showStatus("Loading...");
+
+            // Show iframe, hide welcome
+            welcome.classList.add("hidden");
+            content.classList.remove("hidden");
+
+            // Navigate iframe
+            content.src = url;
+
+            if (addToHistory) {
+                // Truncate forward history if we're not at the end
+                if (historyIndex < historyStack.length - 1) {
+                    historyStack = historyStack.slice(0, historyIndex + 1);
+                }
+                historyStack.push(url);
+                historyIndex = historyStack.length - 1;
+            }
+
+            urlInput.value = url;
+        }
+
+        content.addEventListener("load", () => {
+            clearStatus();
+
+            // Try to get the current URL from iframe (works for same-origin only)
+            try {
+                const iframeUrl = content.contentWindow.location.href;
+                if (iframeUrl && iframeUrl !== "about:blank") {
+                    urlInput.value = iframeUrl;
+                }
+            } catch (e) {
+                // Cross-origin, can't access - that's fine
+            }
+        });
+
+        content.addEventListener("error", () => {
+            showStatus("Failed to load", true);
+        });
+
+        /**
+         * @param {string} url - The URL to validate.
+         * @returns {{url: string} | {error: string}} The rewritten URL or error message.
+         */
+        function validate(url) {
+            if (!url) {
+                return { error: "Please enter a kulfi:// URL or ID52" };
+            }
+
+            // If no protocol specified, assume kulfi://
+            if (!/^([a-z][a-z0-9+\-.]*):\/\//i.test(url)) {
+                url = `kulfi://${url}`;
+            }
+
+            try {
+                const parsed = new URL(url);
+
+                if (parsed.protocol !== "kulfi:") {
+                    return { error: "Only kulfi:// URLs are supported" };
+                }
+
+                const len = parsed.hostname.length;
+                if (len !== 52) {
+                    return { error: `ID52 must be 52 chars (got ${len})` };
+                }
+                if (!/^[a-z0-9]+$/i.test(parsed.hostname)) {
+                    return { error: "ID52 must be alphanumeric only" };
+                }
+
+                return { url: parsed.toString() };
+            } catch (e) {
+                return { error: "Invalid URL format" };
+            }
+        }
+
+        // Focus URL input on load
+        urlInput.focus();
+    </script>
+</body>
+</html>
diff --git a/kulfi/static/init_view.html b/kulfi/static/init_view.html
deleted file mode 100644
index c1c3563..0000000
--- a/kulfi/static/init_view.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<style>
-body, html {
-    margin: 0;
-    padding: 0;
-    font-family: Arial, sans-serif;
-    width: 100%;
-    height: 100%;
-}
-
-main {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-}
-</style>
-
-<main>
-<h1>Enter the URL below and hit Enter.</h1>
-</main>
diff --git a/kulfi/static/navigation.html b/kulfi/static/navigation.html
deleted file mode 100644
index aab1a0f..0000000
--- a/kulfi/static/navigation.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<style>
-    body, html {
-        margin: 0;
-    }
-
-    main {
-        height: 100%;
-        width: 100%;
-        display: flex;
-        flex-direction: row;
-        background-color: #f0f0f0;
-    }
-
-    #url {
-        width: 100%;
-        height: 45px;
-        font-size: 16px;
-        padding: 10px;
-        box-sizing: border-box;
-        background-color: #f0f0f0;
-    }
-
-    button {
-        height: 45px;
-        font-size: 16px;
-        padding: 10px;
-        box-sizing: border-box;
-        cursor: pointer;
-    }
-</style>
-
-<main>
-    <button id="back"><svg fill="#000000" height="32" viewBox="0 0 256 256" width="32" xmlns="http://www.w3.org/2000/svg"><path d="M165.66,202.34a8,8,0,0,1-11.32,11.32l-80-80a8,8,0,0,1,0-11.32l80-80a8,8,0,0,1,11.32,11.32L91.31,128Z"></path></svg></button>
-    <button id="forward"><svg fill="#000000" height="32" viewBox="0 0 256 256" width="32" xmlns="http://www.w3.org/2000/svg"><path d="M181.66,133.66l-80,80a8,8,0,0,1-11.32-11.32L164.69,128,90.34,53.66a8,8,0,0,1,11.32-11.32l80,80A8,8,0,0,1,181.66,133.66Z"></path></svg></button>
-    <input id="url" placeholder="enter kulfi://... url and hit enter" type="text" />
-    <button id="submit" type="button">Go</button>
-    <span id="loading"></span>
-</main>
-
-<script>
-    const urlInput = document.querySelector("#url");
-    const loading = document.querySelector("#loading");
-
-    const invoke = window.__TAURI__.core.invoke;
-    const emitTo = window.__TAURI__.event.emitTo;
-    const listen = window.__TAURI__.event.listen;
-
-    urlInput.addEventListener("keydown", function(event) {
-        if (event.key !== "Enter") {
-            return;
-        }
-
-        goToUrl();
-    });
-
-    document.querySelector("#submit").addEventListener("click", goToUrl);
-
-    listen("url-changed", (e) => {
-        const url = e.payload;
-        console.log("URL changed to:", url);
-        urlInput.value = url;
-    });
-
-    document.querySelector("#back").addEventListener("click", () => {
-        emitTo("browser_view", "nav-back")
-          .then(() => {
-            console.log("Request to go back one page emitted successfully.");
-          })
-          .catch(err => {
-            console.error("Failed to request nav back request:", err);
-          });
-    });
-
-    document.querySelector("#forward").addEventListener("click", () => {
-        emitTo("browser_view", "nav-forward")
-          .then(() => {
-            console.log("Request to go forward one page emitted successfully.");
-          })
-          .catch(err => {
-            console.error("Failed to request nav forward request:", err);
-          });
-    });
-
-    function goToUrl() {
-        let url = urlInput.value.trim();
-
-        console.log("Button clicked, URL entered:", url);
-
-        url = validate(url);
-
-        if (!url) {
-            console.error("Invalid URL format:", url);
-            console.info("Please enter a valid URL in the format \"kulfi://<id52>/\".");
-            console.info("URLs starting with id52 are also accepted, e.g, <id52>/some-path/");
-            return;
-        }
-
-        loading.textContent = "Loading...";
-
-        invoke("open_url", { url })
-            .then(() => {
-                console.log("URL opened successfully:", url);
-            })
-            .catch((error) => {
-                console.error("Error opening URL:", error);
-            })
-            .finally(() => {
-                loading.textContent = "";
-            });
-    }
-
-    /**
-    * @param {string} url - The URL to validate.
-    * @returns {string | null} The rewritten URL if it's valid, null otherwise.
-    */
-    function validate(url) {
-        if (!url) {
-            return null;
-        }
-
-        // if no protocol is specified, assume kulfi:// or https://
-        if (!/^([a-z][a-z0-9+\-.]*):\/\//i.test(url)) {
-            const firstPart = url.split("/")[0];
-            if (firstPart.length === 52) {
-                console.info("Detected id52 format, assuming kulfi:// url. Use https:// explicitly to override");
-                url = `kulfi://${url}`;
-            } else {
-                console.info("assuming https://");
-                url = `https://${url}`;
-            }
-        }
-
-        try {
-            const parsed = new URL(url);
-
-            console.info("using protocol: ", parsed.protocol);
-
-            if (parsed.protocol === "kulfi:" 
-                && parsed.hostname.length !== 52) {
-                console.error("kulfi:// protocol requires hostname to be id52");
-                return null;
-            }
-
-            return parsed.toString();
-        } catch (e) {
-            console.error("Invalid URL format:", e);
-            return null;
-        }
-    }
-</script>