Merge branch 'dev' of skyjake.fi:gemini/lagrange into dev

77 files changed, 7543 insertions, 3550 deletions

diff --git a/src/app.c b/src/app.c
index 28b32939..6392e7fa 100644
--- a/src/app.c
+++ b/src/app.c
@@ -55,6 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/path.h>
 #include <the_Foundation/process.h>
 #include <the_Foundation/sortedarray.h>
+#include <the_Foundation/stringset.h>
 #include <the_Foundation/time.h>
 #include <the_Foundation/version.h>
 #include <SDL.h>
@@ -71,6 +72,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #if defined (iPlatformAppleMobile)
 #   include "ios.h"
 #endif
+#if defined (iPlatformAndroidMobile)
+#include <SDL_log.h>
+#endif
 #if defined (iPlatformMsys)
 #   include "win32.h"
 #endif
@@ -108,6 +112,7 @@ static const char *defaultDataDir_App_ = "~/config/settings/lagrange";
 static const char *prefsFileName_App_      = "prefs.cfg";
 static const char *oldStateFileName_App_   = "state.binary";
 static const char *stateFileName_App_      = "state.lgr";
+static const char *tempStateFileName_App_  = "state.lgr.tmp";
 static const char *defaultDownloadDir_App_ = "~/Downloads";
 
 static const int idleThreshold_App_ = 1000; /* ms */
@@ -115,6 +120,7 @@ static const int idleThreshold_App_ = 1000; /* ms */
 struct Impl_App {
     iCommandLine args;
     iString *    execPath;
+    iStringSet * tempFilesPendingDeletion;
     iMimeHooks * mimehooks;
     iGmCerts *   certs;
     iVisited *   visited;
@@ -127,6 +133,7 @@ struct Impl_App {
     iBool        isRunning;
     iBool        isRunningUnderWindowSystem;
     iBool        isDarkSystemTheme;
+    iBool        isSuspended;
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
     iBool        isIdling;
     uint32_t     lastEventTime;
@@ -164,7 +171,11 @@ struct Impl_Ticker {
 
 static int cmp_Ticker_(const void *a, const void *b) {
     const iTicker *elems[2] = { a, b };
-    return iCmp(elems[0]->context, elems[1]->context);
+    const int cmp = iCmp(elems[0]->context, elems[1]->context);
+    if (cmp) {
+        return cmp;
+    }
+    return iCmp((void *) elems[0]->callback, (void *) elems[1]->callback);
 }
 
 /*----------------------------------------------------------------------------------------------*/
@@ -237,6 +248,13 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "linespacing.set arg:%f\n", d->prefs.lineSpacing);
     appendFormat_String(str, "returnkey.set arg:%d\n", d->prefs.returnKey);
+    for (size_t i = 0; i < iElemCount(d->prefs.navbarActions); i++) {
+        appendFormat_String(str, "navbar.action.set arg:%d button:%d\n", d->prefs.navbarActions[i], i);
+    }
+#if defined (iPlatformMobile)
+    appendFormat_String(str, "toolbar.action.set arg:%d button:0\n", d->prefs.toolbarActions[0]);
+    appendFormat_String(str, "toolbar.action.set arg:%d button:1\n", d->prefs.toolbarActions[1]);
+#endif
     iConstForEach(StringSet, fp, d->prefs.disabledFontPacks) {
         appendFormat_String(str, "fontpack.disable id:%s\n", cstr_String(fp.value));
     }
@@ -263,6 +281,7 @@ static iString *serializePrefs_App_(const iApp *d) {
         { "prefs.bookmarks.addbottom", &d->prefs.addBookmarksToBottom },
         { "prefs.archive.openindex", &d->prefs.openArchiveIndexPages },
         { "prefs.font.warnmissing", &d->prefs.warnAboutMissingGlyphs },
+        { "prefs.blink", &d->prefs.blinkingCursor },
     };
     iForIndices(i, boolPrefs) {
         appendFormat_String(str, "%s.changed arg:%d\n", boolPrefs[i].id, *boolPrefs[i].value);
@@ -313,6 +332,9 @@ static const char *dataDir_App_(void) {
 }
 
 static const char *downloadDir_App_(void) {
+#if defined (iPlatformAndroidMobile)
+    return concatPath_CStr(SDL_AndroidGetInternalStoragePath(), "Downloads");
+#endif
 #if defined (iPlatformLinux) || defined (iPlatformOther)
     /* Parse user-dirs.dirs using the `xdg-user-dir` tool. */
     iProcess *proc = iClob(new_Process());
@@ -363,7 +385,7 @@ static void loadPrefs_App_(iApp *d) {
                 setUiScale_Window(get_Window(), argf_Command(cmd));
             }
             else if (equal_Command(cmd, "uilang")) {
-                const char *id = cstr_Rangecc(range_Command(cmd, "id"));
+                const char *id = cstr_Command(cmd, "id");
                 setCStr_String(&d->prefs.strings[uiLanguage_PrefsString], id);
                 setCurrent_Lang(id);
             }
@@ -385,6 +407,12 @@ static void loadPrefs_App_(iApp *d) {
                 insert_StringSet(d->prefs.disabledFontPacks,
                                  collect_String(suffix_Command(cmd, "id")));
             }
+#if defined (iPlatformAndroidMobile)
+            else if (equal_Command(cmd, "returnkey.set")) {
+                /* Hardcoded to avoid accidental presses of the virtual Return key. */
+                d->prefs.returnKey = default_ReturnKeyBehavior;
+            }
+#endif
 #if !defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)
             else if (equal_Command(cmd, "downloads")) {
                 continue; /* can't change downloads directory */
@@ -410,11 +438,13 @@ static void loadPrefs_App_(iApp *d) {
     iRelease(f);
     /* Upgrade checks. */
     if (cmp_Version(&upgradedFromAppVersion, &(iVersion){ 1, 8, 0 }) < 0) {
+#if !defined (iPlatformAppleMobile) && !defined (iPlatformAndroidMobile)
         /* When upgrading to v1.8.0, the old hardcoded font library is gone and that means
            UI strings may not have the right fonts available for the UI to remain
            usable. */
         postCommandf_App("uilang id:en");
         postCommand_App("~fontpack.suggest.classic");
+#endif
     }
 #if !defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
     d->prefs.customFrame = iFalse;
@@ -505,7 +535,7 @@ static iBool loadState_App_(iApp *d) {
                     if (flags & 8) {
                         postCommand_Widget(sidebar2, "feeds.mode arg:%d", unread_FeedsMode);
                     }
-                    if (deviceType_App() != phone_AppDeviceType) {
+                    if (deviceType_App() == desktop_AppDeviceType) {
                         setWidth_SidebarWidget(sidebar,  widths[0]);
                         setWidth_SidebarWidget(sidebar2, widths[1]);
                         if (flags & 1) postCommand_Root(root, "sidebar.toggle noanim:1");
@@ -561,7 +591,7 @@ static void saveState_App_(const iApp *d) {
        navigation history, cached content) and depends closely on the widget
        tree. The data is largely not reorderable and should not be modified
        by the user manually. */
-    iFile *f = newCStr_File(concatPath_CStr(dataDir_App_(), stateFileName_App_));
+    iFile *f = newCStr_File(concatPath_CStr(dataDir_App_(), tempStateFileName_App_));
     if (open_File(f, writeOnly_FileMode)) {
         writeData_File(f, magicState_App_, 4);
         writeU32_File(f, latest_FileVersion); /* version */
@@ -603,11 +633,19 @@ static void saveState_App_(const iApp *d) {
             write8_File(f, flags);
             serializeState_DocumentWidget(i.object, stream_File(f));
         }
+        iRelease(f);
     }
     else {
+        iRelease(f);
         fprintf(stderr, "[App] failed to save state: %s\n", strerror(errno));
+        return;
     }
-    iRelease(f);
+    /* Copy it over to the real file. This avoids truncation if the app for any reason crashes
+       before the state file is fully written. */
+    const char *tempName = concatPath_CStr(dataDir_App_(), tempStateFileName_App_);
+    const char *finalName = concatPath_CStr(dataDir_App_(), stateFileName_App_);
+    remove(finalName);
+    rename(tempName, finalName);
 }
 
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
@@ -678,18 +716,22 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
         appendCStr_String(cmds, "tabs.new\n");
         requestRaise = iTrue;
     }
+    iBool gotResult = iFalse;
     if (!isEmpty_String(cmds)) {
         iString *result = communicate_Ipc(cmds, requestRaise);
         if (result) {
             fwrite(cstr_String(result), 1, size_String(result), stdout);
             fflush(stdout);
+            if (!isEmpty_String(result)) {
+                gotResult = iTrue;
+            }
         }
         delete_String(result);
     }
     iUnused(instance);
-//    else {
-//        printf("Lagrange already running (PID %d)\n", instance);
-//    }
+    if (!gotResult) {
+        printf("Commands sent to Lagrange process %d\n", instance);
+    }
     terminate_App_(0);
 }
 #endif /* defined (LAGRANGE_ENABLE_IPC) */
@@ -714,6 +756,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->isRunningUnderWindowSystem = iTrue;
 #endif
     d->isDarkSystemTheme = iTrue; /* will be updated by system later on, if supported */
+    d->isSuspended = iFalse;
+    d->tempFilesPendingDeletion = new_StringSet();
     init_CommandLine(&d->args, argc, argv);
     /* Where was the app started from? We ask SDL first because the command line alone
        cannot be relied on (behavior differs depending on OS). */ {
@@ -920,6 +964,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
     if (!loadState_App_(d)) {
         postCommand_Root(NULL, "open url:about:help");
     }
+    postCommand_App("~navbar.actions.changed");
+    postCommand_App("~toolbar.actions.changed");
     postCommand_Root(NULL, "~window.unfreeze");
     postCommand_Root(NULL, "font.reset");
     d->autoReloadTimer = SDL_AddTimer(60 * 1000, postAutoReloadCommand_App_, NULL);
@@ -986,6 +1032,11 @@ static void deinit_App(iApp *d) {
     deinit_Periodic(&d->periodic);
     deinit_Lang();
     iRecycle();
+    /* Delete all temporary files created while running. */
+    iConstForEach(StringSet, tmp, d->tempFilesPendingDeletion) {
+        remove(cstr_String(tmp.value));
+}
+    iRelease(d->tempFilesPendingDeletion);
 }
 
 const iString *execPath_App(void) {
@@ -1000,7 +1051,7 @@ const iString *downloadDir_App(void) {
     return collect_String(cleaned_Path(&app_.prefs.strings[downloadDir_PrefsString]));
 }
 
-const iString *downloadPathForUrl_App(const iString *url, const iString *mime) {
+const iString *fileNameForUrl_App(const iString *url, const iString *mime) {
     /* Figure out a file name from the URL. */
     iUrl parts;
     init_Url(&parts, url);
@@ -1026,22 +1077,27 @@ const iString *downloadPathForUrl_App(const iString *url, const iString *mime) {
         }
     }
     if (startsWith_String(name, "~")) {
-        /* This would be interpreted as a reference to a home directory. */
+        /* This might be interpreted as a reference to a home directory. */
         remove_Block(&name->chars, 0, 1);
     }
-    iString *savePath = concat_Path(downloadDir_App(), name);
-    if (lastIndexOfCStr_String(savePath, ".") == iInvalidPos) {
+    if (lastIndexOfCStr_String(name, ".") == iInvalidPos) {
+        /* TODO: Needs the inverse of `mediaTypeFromFileExtension_String()`. */
         /* No extension specified in URL. */
         if (startsWith_String(mime, "text/gemini")) {
-            appendCStr_String(savePath, ".gmi");
+            appendCStr_String(name, ".gmi");
         }
         else if (startsWith_String(mime, "text/")) {
-            appendCStr_String(savePath, ".txt");
+            appendCStr_String(name, ".txt");
         }
         else if (startsWith_String(mime, "image/")) {
-            appendCStr_String(savePath, cstr_String(mime) + 6);
+            appendCStr_String(name, cstr_String(mime) + 6);
         }
     }
+    return name;
+}
+
+const iString *downloadPathForUrl_App(const iString *url, const iString *mime) {
+    iString *savePath = concat_Path(downloadDir_App(), fileNameForUrl_App(url, mime));
     if (fileExists_FileInfo(savePath)) {
         /* Make it unique. */
         iDate now;
@@ -1056,6 +1112,22 @@ const iString *downloadPathForUrl_App(const iString *url, const iString *mime) {
     return collect_String(savePath);
 }
 
+const iString *temporaryPathForUrl_App(const iString *url, const iString *mime) {
+    iApp *d = &app_;
+#if defined (P_tmpdir)
+    iString *      tmpPath = collectNew_String();
+    const iRangecc tmpDir  = range_CStr(P_tmpdir);
+#else
+    iString *      tmpPath = collectNewCStr_String(tmpnam(NULL));
+    const iRangecc tmpDir  = dirName_Path(tmpPath);
+#endif
+    set_String(
+        tmpPath,
+        collect_String(concat_Path(collectNewRange_String(tmpDir), fileNameForUrl_App(url, mime))));
+    insert_StringSet(d->tempFilesPendingDeletion, tmpPath); /* deleted in `deinit_App` */
+    return tmpPath;
+}
+
 const iString *debugInfo_App(void) {
     extern char **environ; /* The environment variables. */
     iApp *d = &app_;
@@ -1175,9 +1247,6 @@ iBool findCachedContent_App(const iString *url, iString *mime_out, iBlock *data_
 #endif
 
 iLocalDef iBool isWaitingAllowed_App_(iApp *d) {
-    if (!isEmpty_Periodic(&d->periodic)) {
-        return iFalse;
-    }
     if (d->warmupFrames > 0) {
         return iFalse;
     }
@@ -1191,16 +1260,19 @@ iLocalDef iBool isWaitingAllowed_App_(iApp *d) {
 
 static iBool nextEvent_App_(iApp *d, enum iAppEventMode eventMode, SDL_Event *event) {
     if (eventMode == waitForNewEvents_AppEventMode && isWaitingAllowed_App_(d)) {
-        /* If there are periodic commands pending, wait only for a short while. */
-        if (!isEmpty_Periodic(&d->periodic)) {
-            return SDL_WaitEventTimeout(event, 500);
-        }
         /* We may be allowed to block here until an event comes in. */
         if (isWaitingAllowed_App_(d)) {
             return SDL_WaitEvent(event);
         }
     }
+    /* SDL regression circa 2.0.18? SDL_PollEvent() doesn't always return 
+       events posted immediately beforehand. Waiting with a very short timeout
+       seems to work better. */
+#if defined (iPlatformLinux) && SDL_VERSION_ATLEAST(2, 0, 18)
+    return SDL_WaitEventTimeout(event, 1);
+#else
     return SDL_PollEvent(event);
+#endif
 }
 
 static iPtrArray *listWindows_App_(const iApp *d, iPtrArray *windows) {
@@ -1239,6 +1311,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
                 break;
             case SDL_APP_WILLENTERFOREGROUND:
                 invalidate_Window(as_Window(d->window));
+                d->isSuspended = iFalse;
                 break;
             case SDL_APP_DIDENTERFOREGROUND:
                 gotEvents = iTrue;
@@ -1256,6 +1329,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
                 setFreezeDraw_MainWindow(d->window, iTrue);
                 savePrefs_App_(d);
                 saveState_App_(d);
+                d->isSuspended = iTrue;
                 break;
             case SDL_APP_TERMINATING:
                 setFreezeDraw_MainWindow(d->window, iTrue);
@@ -1284,6 +1358,10 @@ void processEvents_App(enum iAppEventMode eventMode) {
                 break;
             }
             default: {
+                if (ev.type == SDL_USEREVENT && ev.user.code == periodic_UserEventCode) {
+                    dispatchCommands_Periodic(&d->periodic);
+                    continue;
+                }
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
                 if (ev.type == SDL_USEREVENT && ev.user.code == asleep_UserEventCode) {
                     if (SDL_GetTicks() - d->lastEventTime > idleThreshold_App_ &&
@@ -1323,28 +1401,6 @@ void processEvents_App(enum iAppEventMode eventMode) {
 #endif
                 /* Scroll events may be per-pixel or mouse wheel steps. */
                 if (ev.type == SDL_MOUSEWHEEL) {
-#if defined (iPlatformAppleDesktop)
-                    /* On macOS, we handle both trackpad and mouse events. We expect SDL to identify
-                       which device is sending the event. */
-                    if (ev.wheel.which == 0) {
-                        /* Trackpad with precise scrolling w/inertia (points). */
-                        setPerPixel_MouseWheelEvent(&ev.wheel, iTrue);
-                        ev.wheel.x *= -d->window->base.pixelRatio;
-                        ev.wheel.y *= d->window->base.pixelRatio;
-                        /* Only scroll on one axis at a time. */
-                        if (iAbs(ev.wheel.x) > iAbs(ev.wheel.y)) {
-                            ev.wheel.y = 0;
-                        }
-                        else {
-                            ev.wheel.x = 0;
-                        }
-                    }
-                    else {
-                        /* Disregard wheel acceleration applied by the OS. */
-                        ev.wheel.x = -ev.wheel.x;
-                        ev.wheel.y = iSign(ev.wheel.y);
-                    }
-#endif
 #if defined (iPlatformMsys)
                     ev.wheel.x = -ev.wheel.x;
 #endif
@@ -1460,10 +1516,10 @@ void processEvents_App(enum iAppEventMode eventMode) {
     deinit_PtrArray(&windows);
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
     if (d->isIdling && !gotEvents) {
-        /* This is where we spend most of our time when idle. 60 Hz still quite a lot but we
+        /* This is where we spend most of our time when idle. 30 Hz still quite a lot but we
            can't wait too long after the user tries to interact again with the app. In any
-           case, on macOS SDL_WaitEvent() seems to use 10x more CPU time than sleeping. */
-        SDL_Delay(1000 / 60);
+           case, on iOS SDL_WaitEvent() seems to use 10x more CPU time than sleeping (2.0.18). */
+        SDL_Delay(1000 / 30);
     }
 #endif
 backToMainLoop:;
@@ -1478,6 +1534,12 @@ static void runTickers_App_(iApp *d) {
         d->lastTickerTime = 0;
         return;
     }
+    iForIndices(i, d->window->base.roots) {
+        iRoot *root = d->window->base.roots[i];
+        if (root) {
+            root->didAnimateVisualOffsets = iFalse;
+        }
+    }
     /* Tickers may add themselves again, so we'll run off a copy. */
     iSortedArray *pending = copy_SortedArray(&d->tickers);
     clear_SortedArray(&d->tickers);
@@ -1494,6 +1556,12 @@ static void runTickers_App_(iApp *d) {
     if (isEmpty_SortedArray(&d->tickers)) {
         d->lastTickerTime = 0;
     }
+//    iForIndices(i, d->window->base.roots) {
+//        iRoot *root = d->window->base.roots[i];
+//        if (root) {
+//            notifyVisualOffsetChange_Root(root);
+//        }
+//    }
 }
 
 static int resizeWatcher_(void *user, SDL_Event *event) {
@@ -1526,7 +1594,6 @@ static int run_App_(iApp *d) {
     SDL_AddEventWatch(resizeWatcher_, d); /* redraw window during resizing */
 #endif
     while (d->isRunning) {
-        dispatchCommands_Periodic(&d->periodic);
         processEvents_App(waitForNewEvents_AppEventMode);
         runTickers_App_(d);
         refresh_App();
@@ -1680,13 +1747,20 @@ void postCommand_Root(iRoot *d, const char *command) {
     ev.user.data1 = strdup(command);
     ev.user.data2 = d; /* all events are root-specific */
     SDL_PushEvent(&ev);
+    iWindow *win = get_Window();
+#if defined (iPlatformAndroid)
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "%s[command] {%d} %s",
+                app_.isLoadingPrefs ? "[Prefs] " : "",
+                (d == NULL || win == NULL ? 0 : d == win->roots[0] ? 1 : 2),
+                command);
+#else
     if (app_.commandEcho) {
-        iWindow *win = get_Window();
         printf("%s[command] {%d} %s\n",
                app_.isLoadingPrefs ? "[Prefs] " : "",
                (d == NULL || win == NULL ? 0 : d == win->roots[0] ? 1 : 2),
                command); fflush(stdout);
     }
+#endif
 }
 
 void postCommandf_Root(iRoot *d, const char *command, ...) {
@@ -1823,6 +1897,12 @@ static void updatePrefsPinSplitButtons_(iWidget *d, int value) {
     }
 }
 
+static void updatePrefsToolBarActionButton_(iWidget *prefs, int buttonIndex, int action) {
+    updateDropdownSelection_LabelWidget(
+        findChild_Widget(prefs, format_CStr("prefs.toolbaraction%d", buttonIndex + 1)),
+        format_CStr(" arg:%d button:%d", action, buttonIndex));    
+}
+
 static void updateScrollSpeedButtons_(iWidget *d, enum iScrollType type, const int value) {
     const char *typeStr = (type == mouse_ScrollType ? "mouse" : "keyboard");
     for (int i = 0; i <= 40; i++) {
@@ -1913,6 +1993,10 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
                                             format_CStr("returnkey.set arg:%d", arg_Command(cmd)));
         return iFalse;
     }
+    else if (equal_Command(cmd, "toolbar.action.set")) {
+        updatePrefsToolBarActionButton_(d, argLabel_Command(cmd, "button"), arg_Command(cmd));
+        return iFalse;
+    }
     else if (equal_Command(cmd, "pinsplit.set")) {
         updatePrefsPinSplitButtons_(d, arg_Command(cmd));
         return iFalse;
@@ -1957,8 +2041,11 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         }
     }
     else if (equalWidget_Command(cmd, d, "input.resized")) {
-        updatePreferencesLayout_Widget(d);
-        return iFalse;
+        if (!d->root->pendingArrange) {
+            d->root->pendingArrange = iTrue;
+            postCommand_Root(d->root, "root.arrange");
+        }
+        return iTrue;
     }
     return iFalse;
 }
@@ -2176,6 +2263,7 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "fontpack.suggest.classic")) {
+        /* TODO: Don't use this when system fonts are accessible. */
         if (!isInstalled_Fonts("classic-set") && !isInstalled_Fonts("cjk")) {
             makeQuestion_Widget(
                 uiHeading_ColorEscape "${heading.fontpack.classic}",
@@ -2208,6 +2296,22 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "navbar.action.set")) {
+        d->prefs.navbarActions[iClamp(argLabel_Command(cmd, "button"), 0, maxNavbarActions_Prefs - 1)] =
+            iClamp(arg_Command(cmd), 0, max_ToolbarAction - 1);
+        if (!isFrozen) {
+            postCommand_App("~navbar.actions.changed");
+        }
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "toolbar.action.set")) {
+        d->prefs.toolbarActions[iClamp(argLabel_Command(cmd, "button"), 0, 1)] =
+            iClamp(arg_Command(cmd), 0, max_ToolbarAction - 1);
+        if (!isFrozen) {
+            postCommand_App("~toolbar.actions.changed");
+        }
+        return iTrue;        
+    }
     else if (equal_Command(cmd, "translation.languages")) {
         d->prefs.langFrom = argLabel_Command(cmd, "from");
         d->prefs.langTo   = argLabel_Command(cmd, "to");
@@ -2229,6 +2333,9 @@ iBool handleCommand_App(const char *cmd) {
             (argLabel_Command(cmd, "axis") ? vertical_WindowSplit : 0) | (arg_Command(cmd) << 1);
         const char *url = suffixPtr_Command(cmd, "url");
         setCStr_String(d->window->pendingSplitUrl, url ? url : "");
+        if (hasLabel_Command(cmd, "origin")) {
+            set_String(d->window->pendingSplitOrigin, string_Command(cmd, "origin"));
+        }
         postRefresh_App();
         return iTrue;
     }
@@ -2587,6 +2694,10 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.uiAnimations = arg_Command(cmd) != 0;
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.blink.changed")) {
+        d->prefs.blinkingCursor = arg_Command(cmd) != 0;
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.time.24h.changed")) {
         d->prefs.time24h = arg_Command(cmd) != 0;
         return iTrue;
@@ -2642,7 +2753,9 @@ iBool handleCommand_App(const char *cmd) {
     }
 #endif
     else if (equal_Command(cmd, "downloads.open")) {
-        postCommandf_App("open url:%s", cstrCollect_String(makeFileUrl_String(downloadDir_App())));
+        postCommandf_App("open newtab:%d url:%s",
+                         argLabel_Command(cmd, "newtab"),
+                         cstrCollect_String(makeFileUrl_String(downloadDir_App())));
         return iTrue;
     }
     else if (equal_Command(cmd, "ca.file")) {
@@ -2673,14 +2786,29 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "reveal")) {
+        const iString *path = NULL;
+        if (hasLabel_Command(cmd, "path")) {
+            path = suffix_Command(cmd, "path");
+        }
+        else if (hasLabel_Command(cmd, "url")) {
+            path = collect_String(localFilePathFromUrl_String(suffix_Command(cmd, "url")));
+        }
+        if (path) {
+            revealPath_App(path);
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "open")) {
         const char *urlArg = suffixPtr_Command(cmd, "url");
         if (!urlArg) {
             return iTrue; /* invalid command */
         }
-        iString    *url         = collectNewCStr_String(urlArg);
-        const iBool noProxy     = argLabel_Command(cmd, "noproxy") != 0;
-        const iBool fromSidebar = argLabel_Command(cmd, "fromsidebar") != 0;
+        if (findWidget_App("prefs")) {
+            postCommand_App("prefs.dismiss");        
+        }
+        iString    *url     = collectNewCStr_String(urlArg);
+        const iBool noProxy = argLabel_Command(cmd, "noproxy") != 0;
         iUrl parts;
         init_Url(&parts, url);
         if (equal_Rangecc(parts.scheme, "about") && equal_Rangecc(parts.path, "command") &&
@@ -2711,12 +2839,23 @@ iBool handleCommand_App(const char *cmd) {
             openInDefaultBrowser_App(url);
             return iTrue;
         }
+        iDocumentWidget *doc = document_Command(cmd);
+        iDocumentWidget *origin = doc;
+        if (hasLabel_Command(cmd, "origin")) {
+            iDocumentWidget *cmdOrig = findWidget_App(cstr_Command(cmd, "origin"));
+            if (cmdOrig) {
+                origin = cmdOrig;
+            }
+        }
         const int newTab = argLabel_Command(cmd, "newtab");
         if (newTab & otherRoot_OpenTabFlag && numRoots_Window(get_Window()) == 1) {
             /* Need to split first. */
             const iInt2 winSize = get_Window()->size;
-            postCommandf_App("ui.split arg:3 axis:%d newtab:%d url:%s",
+            const int splitMode = argLabel_Command(cmd, "splitmode");
+            postCommandf_App("ui.split arg:%d axis:%d origin:%s newtab:%d url:%s",
+                             splitMode ? splitMode : 3,
                              (float) winSize.x / (float) winSize.y < 0.7f ? 1 : 0,
+                             cstr_String(id_Widget(as_Widget(origin))),
                              newTab & ~otherRoot_OpenTabFlag,
                              cstr_String(url));
             return iTrue;
@@ -2727,15 +2866,16 @@ iBool handleCommand_App(const char *cmd) {
             root = otherRoot_Window(as_Window(d->window), root);
             setKeyRoot_Window(as_Window(d->window), root);
             setCurrent_Root(root); /* need to change for widget creation */
+            doc = document_Command(cmd); /* may be different */
         }
-        iDocumentWidget *doc = document_Command(cmd);
         if (newTab & (new_OpenTabFlag | newBackground_OpenTabFlag)) {
             doc = newTab_App(NULL, (newTab & new_OpenTabFlag) != 0); /* `newtab:2` to open in background */
         }
-        iHistory *history = history_DocumentWidget(doc);
-        const iBool isHistory = argLabel_Command(cmd, "history") != 0;
-        int redirectCount = argLabel_Command(cmd, "redirect");
+        iHistory   *history       = history_DocumentWidget(doc);
+        const iBool isHistory     = argLabel_Command(cmd, "history") != 0;
+        int         redirectCount = argLabel_Command(cmd, "redirect");
         if (!isHistory) {
+            /* TODO: Shouldn't DocumentWidget manage history on its own? */
             if (redirectCount) {
                 replace_History(history, url);
             }
@@ -2745,16 +2885,10 @@ iBool handleCommand_App(const char *cmd) {
         }
         setInitialScroll_DocumentWidget(doc, argfLabel_Command(cmd, "scroll"));
         setRedirectCount_DocumentWidget(doc, redirectCount);
+        setOrigin_DocumentWidget(doc, origin);
         showCollapsed_Widget(findWidget_App("document.progress"), iFalse);
-        if (prefs_App()->decodeUserVisibleURLs) {
-            urlDecodePath_String(url);
-        }
-        else {
-            urlEncodePath_String(url);
-        }
         setUrlFlags_DocumentWidget(doc, url,
-           (isHistory   ? useCachedContentIfAvailable_DocumentWidgetSetUrlFlag : 0) |
-           (fromSidebar ? openedFromSidebar_DocumentWidgetSetUrlFlag : 0));
+           isHistory ? useCachedContentIfAvailable_DocumentWidgetSetUrlFlag : 0);
         /* Optionally, jump to a text in the document. This will only work if the document
            is already available, e.g., it's from "about:" or restored from cache. */
         const iRangecc gotoHeading = range_Command(cmd, "gotoheading");
@@ -2895,6 +3029,8 @@ iBool handleCommand_App(const char *cmd) {
         iWidget *dlg = makePreferences_Widget();
         updatePrefsThemeButtons_(dlg);
         setText_InputWidget(findChild_Widget(dlg, "prefs.downloads"), &d->prefs.strings[downloadDir_PrefsString]);
+        /* TODO: Use a common table in Prefs to do this more conviently.
+           Also see `serializePrefs_App_()`. */
         setToggle_Widget(findChild_Widget(dlg, "prefs.hoverlink"), d->prefs.hoverLink);
         setToggle_Widget(findChild_Widget(dlg, "prefs.smoothscroll"), d->prefs.smoothScrolling);
         setToggle_Widget(findChild_Widget(dlg, "prefs.imageloadscroll"), d->prefs.loadImageInsteadOfScrolling);
@@ -2905,7 +3041,7 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->prefs.useSystemTheme);
         setToggle_Widget(findChild_Widget(dlg, "prefs.customframe"), d->prefs.customFrame);
         setToggle_Widget(findChild_Widget(dlg, "prefs.animate"), d->prefs.uiAnimations);
-//        setText_InputWidget(findChild_Widget(dlg, "prefs.userfont"), &d->prefs.symbolFontPath);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.blink"), d->prefs.blinkingCursor);
         updatePrefsPinSplitButtons_(dlg, d->prefs.pinSplit);
         updateScrollSpeedButtons_(dlg, mouse_ScrollType, d->prefs.smoothScrollSpeed[mouse_ScrollType]);
         updateScrollSpeedButtons_(dlg, keyboard_ScrollType, d->prefs.smoothScrollSpeed[keyboard_ScrollType]);
@@ -2914,16 +3050,11 @@ iBool handleCommand_App(const char *cmd) {
         updateDropdownSelection_LabelWidget(
             findChild_Widget(dlg, "prefs.returnkey"),
             format_CStr("returnkey.set arg:%d", d->prefs.returnKey));
+        updatePrefsToolBarActionButton_(dlg, 0, d->prefs.toolbarActions[0]);
+        updatePrefsToolBarActionButton_(dlg, 1, d->prefs.toolbarActions[1]);
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
                             collectNewFormat_String("%g", uiScale_Window(as_Window(d->window))));
-//        setFlags_Widget(findChild_Widget(dlg, format_CStr("prefs.font.%d", d->prefs.font)),
-//                        selected_WidgetFlag,
-//                        iTrue);
-//        setFlags_Widget(
-//            findChild_Widget(dlg, format_CStr("prefs.headingfont.%d", d->prefs.headingFont)),
-//            selected_WidgetFlag,
-//            iTrue);
         setFlags_Widget(findChild_Widget(dlg, "prefs.mono.gemini"),
                         selected_WidgetFlag,
                         d->prefs.monospaceGemini);
@@ -2990,13 +3121,16 @@ iBool handleCommand_App(const char *cmd) {
             showTabPage_Widget(tabs, tabPage_Widget(tabs, d->prefs.dialogTab));
         }
         setCommandHandler_Widget(dlg, handlePrefsCommands_);
+        if (argLabel_Command(cmd, "idents") && deviceType_App() != desktop_AppDeviceType) {
+            iWidget *idPanel = panel_Mobile(dlg, 2);
+            iWidget *button  = findUserData_Widget(findChild_Widget(dlg, "panel.top"), idPanel);
+            postCommand_Widget(button, "panel.open");
+    }
     }
     else if (equal_Command(cmd, "navigate.home")) {
         /* Look for bookmarks tagged "homepage". */
-        iRegExp *pattern = iClob(new_RegExp("\\b" homepage_BookmarkTag "\\b",
-                                            caseInsensitive_RegExpOption));
         const iPtrArray *homepages =
-            list_Bookmarks(d->bookmarks, NULL, filterTagsRegExp_Bookmarks, pattern);
+            list_Bookmarks(d->bookmarks, NULL, filterHomepage_Bookmark, NULL);
         if (isEmpty_PtrArray(homepages)) {
             postCommand_Root(get_Root(), "open url:about:lagrange");
         }
@@ -3147,6 +3281,7 @@ iBool handleCommand_App(const char *cmd) {
             d->certs,
             findIdentity_GmCerts(d->certs, collect_Block(hexDecode_Rangecc(range_Command(cmd, "ident")))),
             url);
+        postCommand_App("navigate.reload");
         postCommand_App("idents.changed");
         return iTrue;
     }
@@ -3159,9 +3294,29 @@ iBool handleCommand_App(const char *cmd) {
         else {
             setUse_GmIdentity(ident, collect_String(suffix_Command(cmd, "url")), iFalse);
         }
+        postCommand_App("navigate.reload");
         postCommand_App("idents.changed");
         return iTrue;
     }
+    else if (equal_Command(cmd, "ident.switch")) {
+        /* This is different than "ident.signin" in that the currently used identity's activation
+           URL is used instead of the current one. */
+        const iString     *docUrl = url_DocumentWidget(document_App());
+        const iGmIdentity *cur    = identityForUrl_GmCerts(d->certs, docUrl);
+        iGmIdentity       *dst    = findIdentity_GmCerts(
+            d->certs, collect_Block(hexDecode_Rangecc(range_Command(cmd, "fp"))));
+        if (dst && cur != dst) {
+            iString *useUrl = copy_String(findUse_GmIdentity(cur, docUrl));
+            if (isEmpty_String(useUrl)) {
+                useUrl = copy_String(docUrl);
+            }
+            signIn_GmCerts(d->certs, dst, useUrl);
+            postCommand_App("idents.changed");
+            postCommand_App("navigate.reload");
+            delete_String(useUrl);
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "idents.changed")) {
         saveIdentities_GmCerts(d->certs);
         return iFalse;
@@ -3259,50 +3414,69 @@ void openInDefaultBrowser_App(const iString *url) {
         return;
     }
 #endif
-#if !defined (iPlatformAppleMobile)
+#if defined (iPlatformAppleMobile)
+    if (equalCase_Rangecc(urlScheme_String(url), "file")) {
+        revealPath_App(collect_String(localFilePathFromUrl_String(url)));
+    }
+    return;
+#endif
     iProcess *proc = new_Process();
-    setArguments_Process(proc,
+    setArguments_Process(proc, iClob(newStringsCStr_StringList(
 #if defined (iPlatformAppleDesktop)
-                         iClob(newStringsCStr_StringList("/usr/bin/env", "open", cstr_String(url), NULL))
+        "/usr/bin/env",
+        "open",
+        cstr_String(url),
 #elif defined (iPlatformLinux) || defined (iPlatformOther) || defined (iPlatformHaiku)
-                         iClob(newStringsCStr_StringList("/usr/bin/env", "xdg-open", cstr_String(url), NULL))
+        "/usr/bin/env",
+        "xdg-open",
+        cstr_String(url),
 #elif defined (iPlatformMsys)
-        iClob(newStringsCStr_StringList(
-            concatPath_CStr(cstr_String(execPath_App()), "../urlopen.bat"),
-            cstr_String(url),
-            NULL))
+        concatPath_CStr(cstr_String(execPath_App()), "../urlopen.bat"),
+        cstr_String(url),
         /* TODO: The prompt window is shown momentarily... */
 #endif
+        NULL))
     );
     start_Process(proc);
-    waitForFinished_Process(proc); /* TODO: test on Windows */
+    waitForFinished_Process(proc);
     iRelease(proc);
-#endif
 }
 
+#include <the_Foundation/thread.h>
+
 void revealPath_App(const iString *path) {
 #if defined (iPlatformAppleDesktop)
-    const char *scriptPath = concatPath_CStr(dataDir_App_(), "revealfile.scpt");
-    iFile *f = newCStr_File(scriptPath);
-    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
-        /* AppleScript to select a specific file. */
-        write_File(f, collect_Block(newCStr_Block("on run argv\n"
-                                                  "  tell application \"Finder\"\n"
-                                                  "    activate\n"
-                                                  "    reveal POSIX file (item 1 of argv) as text\n"
-                                                  "  end tell\n"
-                                                  "end run\n")));
-        close_File(f);
-        iProcess *proc = new_Process();
+    iProcess *proc = new_Process();
+    setArguments_Process(
+        proc, iClob(newStringsCStr_StringList("/usr/bin/open", "-R", cstr_String(path), NULL)));
+    start_Process(proc);
+    iRelease(proc);
+#elif defined (iPlatformAppleMobile)
+    /* Use a share sheet. */
+    openFileActivityView_iOS(path);
+#elif defined (iPlatformLinux) || defined (iPlatformHaiku)
+    iProcess *proc = NULL;
+    /* Try with `dbus-send` first. */ {
+        proc = new_Process();
         setArguments_Process(
             proc,
             iClob(newStringsCStr_StringList(
-                "/usr/bin/osascript", scriptPath, cstr_String(path), NULL)));
+                "/usr/bin/dbus-send",
+                "--print-reply",
+                "--dest=org.freedesktop.FileManager1",
+                "/org/freedesktop/FileManager1",
+                "org.freedesktop.FileManager1.ShowItems",
+                format_CStr("array:string:%s", makeFileUrl_CStr(cstr_String(path))),
+                "string:",
+                NULL)));
         start_Process(proc);
+        waitForFinished_Process(proc);
+        const iBool dbusDidSucceed = (exitStatus_Process(proc) == 0);
         iRelease(proc);
+        if (dbusDidSucceed) {
+            return;
+        }
     }
-    iRelease(f);
-#elif defined (iPlatformLinux) || defined (iPlatformHaiku)
     iFileInfo *inf = iClob(new_FileInfo(path));
     iRangecc target;
     if (isDirectory_FileInfo(inf)) {
@@ -3311,7 +3485,7 @@ void revealPath_App(const iString *path) {
     else {
         target = dirName_Path(path);
     }
-    iProcess *proc = new_Process();
+    proc = new_Process();
     setArguments_Process(
         proc, iClob(newStringsCStr_StringList("/usr/bin/env", "xdg-open", cstr_Rangecc(target), NULL)));
     start_Process(proc);
@@ -3365,8 +3539,21 @@ void closePopups_App(void) {
 }
 
 #if defined (iPlatformAndroidMobile)
+
 float displayDensity_Android(void) {
     iApp *d = &app_;
     return toFloat_String(at_CommandLine(&d->args, 1));
 }
+
+#include <jni.h>
+
+JNIEXPORT void JNICALL Java_fi_skyjake_lagrange_LagrangeActivity_postAppCommand(
+        JNIEnv* env, jclass jcls,
+        jstring command)
+{
+    const char *cmd = (*env)->GetStringUTFChars(env, command, NULL);
+    postCommand_Root(NULL, cmd);
+    (*env)->ReleaseStringUTFChars(env, command, cmd);
+}
+
 #endif
diff --git a/src/app.h b/src/app.h
index 50d3ac6b..5968de0d 100644
--- a/src/app.h
+++ b/src/app.h
@@ -61,6 +61,7 @@ enum iUserEventCode {
     command_UserEventCode = 1,
     refresh_UserEventCode,
     asleep_UserEventCode,
+    periodic_UserEventCode,
     /* The start of a potential touch tap event is notified via a custom event because
        sending SDL_MOUSEBUTTONDOWN would be premature: we don't know how long the tap will
        take, it could turn into a tap-and-hold for example. */
@@ -110,6 +111,8 @@ enum iColorTheme    colorTheme_App      (void);
 const iString *     schemeProxy_App     (iRangecc scheme);
 iBool               willUseProxy_App    (const iRangecc scheme);
 const iString *     searchQueryUrl_App  (const iString *queryStringUnescaped);
+const iString *     fileNameForUrl_App  (const iString *url, const iString *mime);
+const iString *     temporaryPathForUrl_App(const iString *url, const iString *mime); /* deleted before quitting */
 const iString *     downloadPathForUrl_App(const iString *url, const iString *mime);
 
 typedef void (*iTickerFunc)(iAny *);
diff --git a/src/audio/player.c b/src/audio/player.c
index 94bcd065..de430b17 100644
--- a/src/audio/player.c
+++ b/src/audio/player.c
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/thread.h>
 #include <SDL_audio.h>
 #include <SDL_timer.h>
+#include <SDL.h>
 
 #if defined (LAGRANGE_ENABLE_MPG123)
 #   include <mpg123.h>
@@ -191,7 +192,7 @@ static enum iDecoderStatus decodeVorbis_Decoder_(iDecoder *d) {
         int error;
         int consumed;
         d->vorbis = stb_vorbis_open_pushdata(
-            constData_Block(input), size_Block(input), &consumed, &error, NULL);
+            constData_Block(input), (int) size_Block(input), &consumed, &error, NULL);
         if (!d->vorbis) {
             return needMoreInput_DecoderStatus;
         }
@@ -224,7 +225,7 @@ static enum iDecoderStatus decodeVorbis_Decoder_(iDecoder *d) {
         lock_Mutex(&d->input->mtx);
         d->totalInputSize = size_Block(input);
         int error = 0;
-        stb_vorbis *vrb = stb_vorbis_open_memory(constData_Block(input), size_Block(input),
+        stb_vorbis *vrb = stb_vorbis_open_memory(constData_Block(input), (int) size_Block(input),
                                                  &error, NULL);
         if (vrb) {
             d->totalSamples = stb_vorbis_stream_length_in_samples(vrb);
@@ -739,6 +740,22 @@ size_t sourceDataSize_Player(const iPlayer *d) {
     return size;
 }
 
+static iBool setupSDLAudio_(iBool init) {
+    static iBool isAudioInited_ = iFalse;
+    if (init) {
+        if (SDL_InitSubSystem(SDL_INIT_AUDIO)) {
+            fprintf(stderr, "[SDL] audio init failed: %s\n", SDL_GetError());
+            return iFalse;
+        }
+        isAudioInited_ = iTrue;
+    }
+    else if (isAudioInited_) {
+        SDL_QuitSubSystem(SDL_INIT_AUDIO);
+        isAudioInited_ = iFalse;
+    }
+    return isAudioInited_;
+}
+
 iBool start_Player(iPlayer *d) {
     if (isStarted_Player(d)) {
         return iFalse;
@@ -757,6 +774,9 @@ iBool start_Player(iPlayer *d) {
     }
     content.output.callback = writeOutputSamples_Player_;
     content.output.userdata = d;
+    if (!setupSDLAudio_(iTrue)) {
+        return iFalse;
+    }
     d->device = SDL_OpenAudioDevice(NULL, SDL_FALSE /* playback */, &content.output, &d->spec, 0);
     if (!d->device) {
         return iFalse;
@@ -796,6 +816,7 @@ void stop_Player(iPlayer *d) {
         d->device = 0;
         delete_Decoder(d->decoder);
         d->decoder = NULL;
+        setupSDLAudio_(iFalse);
     }
 }
 
diff --git a/src/bookmarks.c b/src/bookmarks.c
index 5e943387..500caa38 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -37,6 +37,7 @@ void init_Bookmark(iBookmark *d) {
     init_String(&d->url);
     init_String(&d->title);
     init_String(&d->tags);
+    iZap(d->flags);
     iZap(d->when);
     d->parentId = 0;
     d->order = 0;
@@ -48,6 +49,7 @@ void deinit_Bookmark(iBookmark *d) {
     deinit_String(&d->url);
 }
 
+#if 0
 iBool hasTag_Bookmark(const iBookmark *d, const char *tag) {
     if (!d) return iFalse;
     iRegExp *pattern = new_RegExp(format_CStr("\\b%s\\b", tag), caseSensitive_RegExpOption);
@@ -60,7 +62,7 @@ iBool hasTag_Bookmark(const iBookmark *d, const char *tag) {
 
 void addTag_Bookmark(iBookmark *d, const char *tag) {
     if (!isEmpty_String(&d->tags)) {
-        appendChar_String(&d->tags, ' ');
+        appendCStr_String(&d->tags, " ");
     }
     appendCStr_String(&d->tags, tag);
 }
@@ -72,6 +74,93 @@ void removeTag_Bookmark(iBookmark *d, const char *tag) {
         trim_String(&d->tags);
     }
 }
+#endif
+
+static struct {
+    uint32_t    bit;
+    const char *tag;
+    iRegExp *   pattern;
+    iRegExp *   oldPattern;
+}
+specialTags_[] = {
+    { homepage_BookmarkFlag, ".homepage" },
+    { remoteSource_BookmarkFlag, ".remotesource" },
+    { linkSplit_BookmarkFlag, ".linksplit" },
+    { userIcon_BookmarkFlag, ".usericon" },
+    { subscribed_BookmarkFlag, ".subscribed" },
+    { headings_BookmarkFlag, ".headings" },
+    { ignoreWeb_BookmarkFlag, ".ignoreweb" },
+    /* `remote_BookmarkFlag` not included because it's runtime only */
+};
+
+static void updatePatterns_(size_t index) {
+    if (!specialTags_[index].pattern) {
+        specialTags_[index].pattern = new_RegExp(format_CStr("(?<!\\w)\\%s\\b(?!\\w)",
+                                                             specialTags_[index].tag),
+                                                 caseSensitive_RegExpOption); /* never released */
+    }
+    if (!specialTags_[index].oldPattern) {
+        /* TODO: Get rid of these when compatibility with v1.9 or older is not important. */
+        specialTags_[index].oldPattern =
+            new_RegExp(format_CStr("\\b%s\\b", specialTags_[index].tag + 1), /* dotless */
+                       caseSensitive_RegExpOption); /* never released */
+    }
+}
+
+static void normalizeSpacesInTags_(iString *tags) {
+    iBool wasSpace = iFalse;
+    iString out;
+    init_String(&out);
+    for (const char *ch = constBegin_String(tags); ch != constEnd_String(tags); ch++) {
+        if (*ch == ' ') {
+            if (!wasSpace) {
+                wasSpace = iTrue;
+            }
+            else {
+                continue;
+            }
+        }
+        else {
+            wasSpace = iFalse;
+        }
+        appendData_Block(&out.chars, ch, 1);
+    }
+    trim_String(&out);
+    set_String(tags, &out);
+    deinit_String(&out);
+}
+
+static void unpackDotTags_Bookmark_(iBookmark *d) {
+    iZap(d->flags);
+    iForIndices(i, specialTags_) {
+        updatePatterns_(i);
+        iRegExpMatch m;
+        init_RegExpMatch(&m);
+        iBool isSet = matchString_RegExp(specialTags_[i].pattern, &d->tags, &m);
+        if (!isSet) {
+            init_RegExpMatch(&m);
+            isSet = matchString_RegExp(specialTags_[i].oldPattern, &d->tags, &m);
+        }
+        iChangeFlags(d->flags, specialTags_[i].bit, isSet);
+        if (isSet) {
+            remove_Block(&d->tags.chars, m.range.start, size_Range(&m.range));
+        }
+    }
+    normalizeSpacesInTags_(&d->tags);
+}
+
+static iString *packedDotTags_Bookmark_(const iBookmark *d) {
+    iString *withDot = copy_String(&d->tags);
+    iForIndices(i, specialTags_) {
+        if (d->flags & specialTags_[i].bit) {
+            if (!isEmpty_String(withDot)) {
+                appendCStr_String(withDot, " ");
+            }
+            appendCStr_String(withDot, specialTags_[i].tag);
+        }
+    }
+    return withDot;
+}
 
 iDefineTypeConstruction(Bookmark)
 
@@ -176,6 +265,7 @@ static void loadOldFormat_Bookmarks(iBookmarks *d, const char *dirPath) {
             setRange_String(&bm->title, line);
             nextSplit_Rangecc(src, "\n", &line);
             setRange_String(&bm->tags, line);
+            unpackDotTags_Bookmark_(bm);
             insert_Bookmarks_(d, bm);
         }
     }
@@ -220,6 +310,7 @@ static void handleKeyValue_BookmarkLoader_(void *context, const iString *table,
         }
         else if (!cmp_String(key, "tags") && tv->type == string_TomlType) {
             set_String(&bm->tags, tv->value.string);
+            unpackDotTags_Bookmark_(bm);
         }
         else if (!cmp_String(key, "icon") && tv->type == int64_TomlType) {
             bm->icon = (iChar) tv->value.int64;
@@ -292,7 +383,6 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
 
 void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
     lock_Mutex(d->mtx);
-    iRegExp *remotePattern = iClob(new_RegExp("\\bremote\\b", caseSensitive_RegExpOption));
     iFile *f = newCStr_File(concatPath_CStr(dirPath, fileName_Bookmarks_));
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {        
         iString *str = collectNew_String();
@@ -300,13 +390,12 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
         writeData_File(f, cstr_String(str), size_String(str));
         iConstForEach(Hash, i, &d->bookmarks) {
             const iBookmark *bm = (const iBookmark *) i.value;
-            iRegExpMatch m;
-            init_RegExpMatch(&m);
-            if (matchString_RegExp(remotePattern, &bm->tags, &m)) {
+            if (bm->flags & remote_BookmarkFlag) {
                 /* Remote bookmarks are not saved. */
                 continue;
             }
             iBeginCollect();
+            const iString *packedTags = collect_String(packedDotTags_Bookmark_(bm));
             format_String(str,
                           "[%d]\n"
                           "url = \"%s\"\n"
@@ -317,7 +406,7 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
                           id_Bookmark(bm),
                           cstrCollect_String(quote_String(&bm->url, iFalse)),
                           cstrCollect_String(quote_String(&bm->title, iFalse)),
-                          cstrCollect_String(quote_String(&bm->tags, iFalse)),
+                          cstrCollect_String(quote_String(packedTags, iFalse)),
                           bm->icon,
                           seconds_Time(&bm->when),
                           cstrCollect_String(format_Time(&bm->when, "%Y-%m-%d")));
@@ -397,7 +486,7 @@ iBool updateBookmarkIcon_Bookmarks(iBookmarks *d, const iString *url, iChar icon
     const uint32_t id = findUrl_Bookmarks(d, url);
     if (id) {
         iBookmark *bm = get_Bookmarks(d, id);
-        if (!hasTag_Bookmark(bm, remote_BookmarkTag) && !hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
+        if (~bm->flags & remote_BookmarkFlag && ~bm->flags & userIcon_BookmarkFlag) {
             if (icon != bm->icon) {
                 bm->icon = icon;
                 changed = iTrue;
@@ -422,19 +511,13 @@ iChar siteIcon_Bookmarks(const iBookmarks *d, const iString *url) {
     if (isEmpty_String(url)) {
         return 0;
     }
-    static iRegExp *tagPattern_;
-    if (!tagPattern_) {
-        tagPattern_ = new_RegExp("\\b" userIcon_BookmarkTag "\\b", caseSensitive_RegExpOption);
-    }
     const iRangecc urlRoot      = urlRoot_String(url);
     size_t         matchingSize = iInvalidSize; /* we'll pick the shortest matching */
     iChar          icon         = 0;
     lock_Mutex(d->mtx);
     iConstForEach(Hash, i, &d->bookmarks) {
         const iBookmark *bm = (const iBookmark *) i.value;
-        iRegExpMatch m;
-        init_RegExpMatch(&m);
-        if (bm->icon && matchString_RegExp(tagPattern_, &bm->tags, &m)) {
+        if (bm->icon && bm->flags & userIcon_BookmarkFlag) {
             const iRangecc bmRoot = urlRoot_String(&bm->url);
             if (equalRangeCase_Rangecc(urlRoot, bmRoot)) {
                 const size_t n = size_String(&bm->url);
@@ -467,10 +550,15 @@ void reorder_Bookmarks(iBookmarks *d, uint32_t id, int newOrder) {
     unlock_Mutex(d->mtx);
 }
 
-iBool filterTagsRegExp_Bookmarks(void *regExp, const iBookmark *bm) {
-    iRegExpMatch m;
-    init_RegExpMatch(&m);
-    return matchString_RegExp(regExp, &bm->tags, &m);
+//iBool filterTagsRegExp_Bookmarks(void *regExp, const iBookmark *bm) {
+//    iRegExpMatch m;
+//    init_RegExpMatch(&m);
+//    return matchString_RegExp(regExp, &bm->tags, &m);
+//}
+
+iBool filterHomepage_Bookmark(void *d, const iBookmark *bm) {
+    iUnused(d);
+    return (bm->flags & homepage_BookmarkFlag) != 0;
 }
 
 static iBool matchUrl_(void *url, const iBookmark *bm) {
@@ -618,7 +706,7 @@ const iString *bookmarkListPage_Bookmarks(const iBookmarks *d, enum iBookmarkLis
 
 static iBool isRemoteSource_Bookmark_(void *context, const iBookmark *d) {
     iUnused(context);
-    return hasTag_Bookmark(d, remoteSource_BookmarkTag);
+    return (d->flags & remoteSource_BookmarkFlag) != 0;
 }
 
 void remoteRequestFinished_Bookmarks_(iBookmarks *d, iGmRequest *req) {
@@ -642,7 +730,6 @@ void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
         initCurrent_Time(&now);
         iRegExp *linkPattern = new_RegExp("^=>\\s*([^\\s]+)(\\s+(.*))?", 0);
         iString src;
-        const iString *remoteTag = collectNewCStr_String("remote");
         initBlock_String(&src, body_GmRequest(req));
         iRangecc srcLine = iNullRange;
         while (nextSplit_Rangecc(range_String(&src), "\n", &srcLine)) {
@@ -660,8 +747,9 @@ void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
                     if (isEmpty_String(titleStr)) {
                         setRange_String(titleStr, urlHost_String(urlStr));
                     }
-                    const uint32_t bmId = add_Bookmarks(d, absUrl, titleStr, remoteTag, 0x2913);
+                    const uint32_t bmId = add_Bookmarks(d, absUrl, titleStr, NULL, 0x2913);
                     iBookmark *bm = get_Bookmarks(d, bmId);
+                    bm->flags |= remote_BookmarkFlag;
                     bm->parentId = *(uint32_t *) userData_Object(req);
                     delete_String(titleStr);
                 }
@@ -690,7 +778,7 @@ void fetchRemote_Bookmarks(iBookmarks *d) {
         size_t numRemoved = 0;
         iForEach(Hash, i, &d->bookmarks) {
             iBookmark *bm = (iBookmark *) i.value;
-            if (hasTag_Bookmark(bm, remote_BookmarkTag)) {
+            if (bm->flags & remote_BookmarkFlag) {
                 remove_HashIterator(&i);
                 delete_Bookmark(bm);
                 numRemoved++;
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 6cb5c8a9..08afdd8b 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -31,27 +31,30 @@ iDeclareType(GmRequest)
 
 iDeclareType(Bookmark)
 iDeclareTypeConstruction(Bookmark)
-
-/* TODO: Make the special internal tags a bitfield, separate from user's tags. */
-
-#define headings_BookmarkTag        "headings"
-#define ignoreWeb_BookmarkTag       "ignoreweb"
-#define homepage_BookmarkTag        "homepage"
-#define linkSplit_BookmarkTag       "linksplit"
-#define remote_BookmarkTag          "remote"
-#define remoteSource_BookmarkTag    "remotesource"
-#define subscribed_BookmarkTag      "subscribed"
-#define userIcon_BookmarkTag        "usericon"
+    
+/* These values are not serialized as-is in bookmarks.ini. Instead, they are included in `tags`
+   with a dot prefix. This helps retain backwards and forwards compatibility. */
+enum iBookmarkFlags {
+    homepage_BookmarkFlag     = iBit(1),
+    remoteSource_BookmarkFlag = iBit(2),
+    linkSplit_BookmarkFlag    = iBit(3),
+    userIcon_BookmarkFlag     = iBit(4),
+    subscribed_BookmarkFlag   = iBit(17),
+    headings_BookmarkFlag     = iBit(18),
+    ignoreWeb_BookmarkFlag    = iBit(19),
+    remote_BookmarkFlag       = iBit(31),
+};
 
 struct Impl_Bookmark {
     iHashNode node;
-    iString url;
-    iString title;
-    iString tags;
-    iChar icon;
-    iTime when;
-    uint32_t parentId; /* remote source or folder */
-    int order;         /* sort order */
+    iString   url;
+    iString   title;
+    iString   tags;
+    uint32_t  flags;
+    iChar     icon;
+    iTime     when;
+    uint32_t  parentId; /* remote source or folder */
+    int       order;    /* sort order */
 };
 
 iLocalDef uint32_t  id_Bookmark         (const iBookmark *d) { return d->node.key; }
@@ -59,23 +62,24 @@ iLocalDef iBool     isFolder_Bookmark   (const iBookmark *d) { return isEmpty_St
 
 iBool   hasParent_Bookmark  (const iBookmark *, uint32_t parentId);
 int     depth_Bookmark      (const iBookmark *);
-iBool   hasTag_Bookmark     (const iBookmark *, const char *tag);
-void    addTag_Bookmark     (iBookmark *, const char *tag);
-void    removeTag_Bookmark  (iBookmark *, const char *tag);
-
-iLocalDef void addTagIfMissing_Bookmark(iBookmark *d, const char *tag) {
-    if (!hasTag_Bookmark(d, tag)) {
-        addTag_Bookmark(d, tag);
-    }
-}
-iLocalDef void addOrRemoveTag_Bookmark(iBookmark *d, const char *tag, iBool add) {
-    if (add) {
-        addTagIfMissing_Bookmark(d, tag);
-    }
-    else {
-        removeTag_Bookmark(d, tag);
-    }
-}
+
+//iBool   hasTag_Bookmark     (const iBookmark *, const char *tag);
+//void    addTag_Bookmark     (iBookmark *, const char *tag);
+//void    removeTag_Bookmark  (iBookmark *, const char *tag);
+
+//iLocalDef void addTagIfMissing_Bookmark(iBookmark *d, const char *tag) {
+//    if (!hasTag_Bookmark(d, tag)) {
+//        addTag_Bookmark(d, tag);
+//    }
+//}
+//iLocalDef void addOrRemoveTag_Bookmark(iBookmark *d, const char *tag, iBool add) {
+//    if (add) {
+//        addTagIfMissing_Bookmark(d, tag);
+//    }
+//    else {
+//        removeTag_Bookmark(d, tag);
+//    }
+//}
 
 int     cmpTitleAscending_Bookmark      (const iBookmark **, const iBookmark **);
 int     cmpTree_Bookmark                (const iBookmark **, const iBookmark **);
@@ -109,7 +113,8 @@ iChar       siteIcon_Bookmarks          (const iBookmarks *, const iString *url)
 uint32_t    findUrl_Bookmarks           (const iBookmarks *, const iString *url); /* O(n) */
 uint32_t    recentFolder_Bookmarks      (const iBookmarks *);
 
-iBool   filterTagsRegExp_Bookmarks      (void *regExp, const iBookmark *);
+//iBool   filterTagsRegExp_Bookmarks      (void *regExp, const iBookmark *);
+iBool       filterHomepage_Bookmark     (void *, const iBookmark *);
 
 /**
  * Lists all or a subset of the bookmarks in a sorted array of Bookmark pointers.
diff --git a/src/defs.h b/src/defs.h
index 9a466674..e2edd100 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -66,10 +66,28 @@ enum iReturnKeyFlag {
     accept_ReturnKeyFlag        = 4, /* shift */
 };
 
+enum iToolbarAction {
+    back_ToolbarAction        = 0,
+    forward_ToolbarAction     = 1,
+    home_ToolbarAction        = 2,
+    parent_ToolbarAction      = 3,
+    reload_ToolbarAction      = 4,
+    newTab_ToolbarAction      = 5,
+    closeTab_ToolbarAction    = 6,
+    addBookmark_ToolbarAction = 7,
+    translate_ToolbarAction   = 8,
+    upload_ToolbarAction      = 9,
+    editPage_ToolbarAction    = 10,
+    findText_ToolbarAction    = 11,
+    settings_ToolbarAction    = 12,
+    sidebar_ToolbarAction     = 13, /* desktop only */
+    max_ToolbarAction
+};
+
 /* Return key behavior is not handled via normal bindings because only certain combinations
    are valid. */
 enum iReturnKeyBehavior {
-    default_ReturnKeyBehavior =
+    acceptWithoutMod_ReturnKeyBehavior =
         shiftReturn_ReturnKeyFlag | (return_ReturnKeyFlag << accept_ReturnKeyFlag),
     acceptWithShift_ReturnKeyBehavior =
         return_ReturnKeyFlag | (shiftReturn_ReturnKeyFlag << accept_ReturnKeyFlag),
@@ -79,6 +97,11 @@ enum iReturnKeyBehavior {
 #else
         return_ReturnKeyFlag | (controlReturn_ReturnKeyFlag << accept_ReturnKeyFlag),
 #endif
+#if defined (iPlatformAndroidMobile)
+    default_ReturnKeyBehavior = acceptWithShift_ReturnKeyBehavior,
+#else
+    default_ReturnKeyBehavior = acceptWithoutMod_ReturnKeyBehavior,
+#endif
 };
 
 int     keyMod_ReturnKeyFlag    (int flag);
@@ -94,7 +117,7 @@ iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
 
 #define menu_Icon           "\U0001d362"
 #define rightArrowhead_Icon "\u27a4"
-#define leftArrowhead_Icon  "\u27a4"
+#define leftArrowhead_Icon  "\u2b9c"
 #define warning_Icon        "\u26a0"
 #define openLock_Icon       "\U0001f513"
 #define closedLock_Icon     "\U0001f512"
@@ -102,7 +125,7 @@ iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
 #define reload_Icon         "\U0001f503"
 #define backArrow_Icon      "\U0001f870"
 #define forwardArrow_Icon   "\U0001f872"
-#define upArrow_Icon        "\u2191"
+#define upArrow_Icon        "\U0001f871"
 #define upArrowBar_Icon     "\u2912"
 #define downArrowBar_Icon   "\u2913"
 #define rightArrowWhite_Icon "\u21e8"
diff --git a/src/feeds.c b/src/feeds.c
index 26b3d6db..a8cbf47a 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -65,7 +65,9 @@ const iString *url_FeedEntry(const iFeedEntry *d) {
 iBool isUnread_FeedEntry(const iFeedEntry *d) {
     const size_t fragPos = indexOf_String(&d->url, '#');
     if (fragPos != iInvalidPos) {
-        /* Check if the entry is newer than the latest visit. */
+        /* Check if the entry is newer than the latest visit. If the URL has not been visited,
+           `urlVisitTime_Visited` returns a zero timestamp that is always earlier than
+           `posted`. */
         const iTime visTime = urlVisitTime_Visited(visited_App(), url_FeedEntry(d));
         return cmp_Time(&visTime, &d->posted) < 0;
     }
@@ -97,8 +99,8 @@ static void init_FeedJob(iFeedJob *d, const iBookmark *bookmark) {
     init_PtrArray(&d->results);
     iZap(d->startTime);
     d->isFirstUpdate = iFalse;
-    d->checkHeadings = hasTag_Bookmark(bookmark, headings_BookmarkTag);
-    d->ignoreWeb     = hasTag_Bookmark(bookmark, ignoreWeb_BookmarkTag);
+    d->checkHeadings = (bookmark->flags & headings_BookmarkFlag) != 0;
+    d->ignoreWeb     = (bookmark->flags & ignoreWeb_BookmarkFlag) != 0;
 }
 
 static void deinit_FeedJob(iFeedJob *d) {
@@ -146,13 +148,7 @@ static void submit_FeedJob_(iFeedJob *d) {
 
 static iBool isSubscribed_(void *context, const iBookmark *bm) {
     iUnused(context);
-    static iRegExp *pattern_ = NULL;
-    if (!pattern_) {
-        pattern_ = new_RegExp("\\bsubscribed\\b", caseSensitive_RegExpOption);
-    }
-    iRegExpMatch m;
-    init_RegExpMatch(&m);
-    return matchString_RegExp(pattern_, &bm->tags, &m);
+    return (bm->flags & subscribed_BookmarkFlag) != 0;
 }
 
 static const iPtrArray *listSubscriptions_(void) {
@@ -443,7 +439,7 @@ static iThreadResult fetch_Feeds_(iThread *thread) {
     iZap(work);
     iBool gotNew = iFalse;
     postCommand_App("feeds.update.started");
-    const int totalJobs = size_PtrArray(&d->jobs);
+    const size_t totalJobs = size_PtrArray(&d->jobs);
     int numFinishedJobs = 0;
     while (!d->stopWorker) {
         /* Start new jobs. */
@@ -482,7 +478,7 @@ static iThreadResult fetch_Feeds_(iThread *thread) {
             }
         }
         if (doNotify) {
-            postCommandf_App("feeds.update.progress arg:%d total:%d", numFinishedJobs, totalJobs);
+            postCommandf_App("feeds.update.progress arg:%d total:%zu", numFinishedJobs, totalJobs);
         }
         /* Stop if everything has finished. */
         if (ongoing == 0 && isEmpty_PtrArray(&d->jobs)) {
@@ -620,7 +616,7 @@ static void load_Feeds_(iFeeds *d) {
                     /* TODO: Cleanup needed...
                        All right, this could maybe use a bit more robust, structured format.
                        The code below is messy. */
-                    const uint32_t feedId = strtoul(line.start, NULL, 16);
+                    const uint32_t feedId = (uint32_t) strtoul(line.start, NULL, 16);
                     if (!nextSplit_Rangecc(range_Block(src), "\n", &line)) {
                         goto aborted;
                     }
diff --git a/src/fontpack.c b/src/fontpack.c
index 79f35526..a440234e 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -818,7 +818,7 @@ const iArray *actions_FontPack(const iFontPack *d, iBool showInstalled) {
         pushBack_Array(
             items,
             &(iMenuItem){ format_Lang(isEnabled ? close_Icon " ${fontpack.disable}"
-                                                : leftArrowhead_Icon " ${fontpack.enable}",
+                                                : "${fontpack.enable}",
                                       fpId),
                           0,
                           0,
diff --git a/src/gmcerts.c b/src/gmcerts.c
index f95fea7d..7b05103b 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -90,7 +90,7 @@ void serialize_GmIdentity(const iGmIdentity *d, iStream *outs) {
     writeU32_Stream(outs, d->icon);
     serialize_String(&d->notes, outs);
     write32_Stream(outs, d->flags);
-    writeU32_Stream(outs, size_StringSet(d->useUrls));
+    writeU32_Stream(outs, (uint32_t) size_StringSet(d->useUrls));
     iConstForEach(StringSet, i, d->useUrls) {
         serialize_String(i.value, outs);
     }
@@ -146,6 +146,7 @@ iBool isUsed_GmIdentity(const iGmIdentity *d) {
 }
 
 iBool isUsedOn_GmIdentity(const iGmIdentity *d, const iString *url) {
+#if 0
     size_t pos = iInvalidPos;
     locate_StringSet(d->useUrls, url, &pos);
     if (pos < size_StringSet(d->useUrls)) {
@@ -159,6 +160,12 @@ iBool isUsedOn_GmIdentity(const iGmIdentity *d, const iString *url) {
             return iTrue;
         }
     }
+#endif
+    iConstForEach(StringSet, i, d->useUrls) {
+        if (startsWithCase_String(url, cstr_String(i.value))) {
+            return iTrue;
+        }
+    }
     return iFalse;
 }
 
@@ -193,7 +200,13 @@ void setUse_GmIdentity(iGmIdentity *d, const iString *url, iBool use) {
         iAssert(wasInserted);
     }
     else {
-        remove_StringSet(d->useUrls, url);
+        iForEach(Array, i, &d->useUrls->strings.values) {
+            iString *used = i.value;
+            if (startsWithCase_String(url, cstr_String(used))) {
+                deinit_String(used);
+                remove_ArrayIterator(&i);
+            }
+        }        
     }
 }
 
@@ -201,6 +214,16 @@ void clearUse_GmIdentity(iGmIdentity *d) {
     clear_StringSet(d->useUrls);
 }
 
+const iString *findUse_GmIdentity(const iGmIdentity *d, const iString *url) {
+    if (!d) return NULL;
+    iConstForEach(StringSet, using, d->useUrls) {
+        if (startsWith_String(url, cstr_String(using.value))) {
+            return using.value;
+        }
+    }
+    return NULL;
+}
+
 const iString *name_GmIdentity(const iGmIdentity *d) {
     iString *name = collect_String(subject_TlsCertificate(d->cert));
     if (startsWith_String(name, "CN = ")) {
@@ -631,7 +654,7 @@ void importIdentity_GmCerts(iGmCerts *d, iTlsCertificate *cert, const iString *n
 }
 
 static const char *certPath_GmCerts_(const iGmCerts *d, const iGmIdentity *identity) {
-    if (!(identity->flags & (temporary_GmIdentityFlag | imported_GmIdentityFlag))) {
+    if (!(identity->flags & temporary_GmIdentityFlag)) {
         const char *finger = cstrCollect_String(hexEncode_Block(&identity->fingerprint));
         return concatPath_CStr(cstr_String(&d->saveDir), format_CStr("idents/%s", finger));
     }
diff --git a/src/gmcerts.h b/src/gmcerts.h
index 02a41c14..6ece1954 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -48,8 +48,9 @@ iBool   isUsed_GmIdentity           (const iGmIdentity *);
 iBool   isUsedOn_GmIdentity         (const iGmIdentity *, const iString *url);
 iBool   isUsedOnDomain_GmIdentity   (const iGmIdentity *, const iRangecc domain);
 
-void    setUse_GmIdentity   (iGmIdentity *, const iString *url, iBool use);
-void    clearUse_GmIdentity (iGmIdentity *);
+void    setUse_GmIdentity           (iGmIdentity *, const iString *url, iBool use);
+void    clearUse_GmIdentity         (iGmIdentity *);
+const iString *findUse_GmIdentity   (const iGmIdentity *, const iString *url);
 
 const iString *name_GmIdentity(const iGmIdentity *);
 
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 9d79830b..19230392 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/intset.h>
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/regexp.h>
+#include <the_Foundation/stringarray.h>
 #include <the_Foundation/stringset.h>
 
 #include <ctype.h>
@@ -163,6 +164,7 @@ struct Impl_GmDocument {
     iBool     enableCommandLinks; /* `about:command?` only allowed on selected pages */
     iBool     isLayoutInvalidated;
     iArray    layout; /* contents of source, laid out in document space */
+    iStringArray auxText; /* generated text that appears on the page but is not part of the source */
     iPtrArray links;
     iString   title; /* the first top-level title */
     iArray    headings;
@@ -554,16 +556,22 @@ static const int maxLedeLines_ = 10;
 
 static void applyAttributes_RunTypesetter_(iRunTypesetter *d, iTextAttrib attrib) {
     /* WARNING: This is duplicated in run_Font_(). Make sure they behave identically. */
-    if (attrib.bold) {
-        d->run.font = fontWithStyle_Text(d->baseFont, bold_FontStyle);
-        d->run.color = tmFirstParagraph_ColorId;
+    if (attrib.monospace) {
+        d->run.font = fontWithFamily_Text(d->baseFont, monospace_FontId);
+        d->run.color = tmPreformatted_ColorId;
     }
     else if (attrib.italic) {
         d->run.font = fontWithStyle_Text(d->baseFont, italic_FontStyle);
     }
-    else if (attrib.monospace) {
-        d->run.font = fontWithFamily_Text(d->baseFont, monospace_FontId);
-        d->run.color = tmPreformatted_ColorId;
+    else if (attrib.regular) {
+        d->run.font = fontWithStyle_Text(d->baseFont, regular_FontStyle);
+    }
+    else if (attrib.bold) {
+        d->run.font = fontWithStyle_Text(d->baseFont, bold_FontStyle);
+        d->run.color = tmFirstParagraph_ColorId;
+    }
+    else if (attrib.light) {
+        d->run.font = fontWithStyle_Text(d->baseFont, light_FontStyle);
     }
     else {
         d->run.font  = d->baseFont;
@@ -643,6 +651,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     static const char *uploadArrow     = upload_Icon;
     static const char *image           = photo_Icon;
     clear_Array(&d->layout);
+    clear_StringArray(&d->auxText);
     clearLinks_GmDocument_(d);
     clear_Array(&d->headings);
     const iArray *oldPreMeta = collect_Array(copy_Array(&d->preMeta)); /* remember fold states */
@@ -927,7 +936,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                                                                  : paragraph_FontId;
             alignDecoration_GmRun_(&icon, iFalse);
             icon.color = linkColor_GmDocument(d, run.linkId, icon_GmLinkPart);
-            icon.flags |= decoration_GmRunFlag;
+            icon.flags |= decoration_GmRunFlag | startOfLine_GmRunFlag;
             pushBack_Array(&d->layout, &icon);
         }
         run.lineType = type;
@@ -1041,7 +1050,12 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             deinit_RunTypesetter_(&rts);
         }
         /* Flag the end of line, too. */
-        ((iGmRun *) back_Array(&d->layout))->flags |= endOfLine_GmRunFlag;
+        iGmRun *lastRun = back_Array(&d->layout);
+        lastRun->flags |= endOfLine_GmRunFlag;
+        if (lastRun->linkId && lastRun->flags & startOfLine_GmRunFlag) {
+            /* Single-run link: the icon should also be marked endOfLine. */
+            lastRun[-1].flags |= endOfLine_GmRunFlag;
+        }
         /* Image or audio content. */
         if (type == link_GmLineType) {
             /* TODO: Cleanup here? Move to a function of its own. */
@@ -1075,7 +1089,9 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                         run.bounds.pos.x  -= d->outsideMargin;
                     }
                     run.visBounds = run.bounds;
-                    const iInt2 maxSize = mulf_I2(imgSize, get_Window()->pixelRatio);
+                    const iInt2 maxSize = mulf_I2(
+                        imgSize,
+                        get_Window()->pixelRatio * iMax(1.0f, (prefs_App()->zoomPercent / 100.0f)));
                     if (width_Rect(run.visBounds) > maxSize.x) {
                         /* Don't scale the image up. */
                         run.visBounds.size.y =
@@ -1085,6 +1101,34 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                         run.bounds.size.y    = run.visBounds.size.y;
                     }
                     pushBack_Array(&d->layout, &run);
+                    pos.y += run.bounds.size.y + margin / 2;
+                    /* Image metadata caption. */ {
+                        run.font = FONT_ID(documentBody_FontId, semiBold_FontStyle, contentSmall_FontSize);
+                        run.color = tmQuoteIcon_ColorId;
+                        run.flags = decoration_GmRunFlag;
+                        run.mediaId = 0;
+                        run.mediaType = 0;
+                        run.visBounds.pos.y = pos.y;
+                        run.visBounds.size.y = lineHeight_Text(run.font);
+                        run.bounds = zero_Rect();
+                        iString caption;
+                        init_String(&caption);
+                        format_String(&caption,
+                                      "%s \u2014 %d x %d \u2014 %.1f%s",
+                                      info.type,
+                                      imgSize.x,
+                                      imgSize.y,
+                                      info.numBytes / 1.0e6f,
+                                      cstr_Lang("mb"));
+                        pushBack_StringArray(&d->auxText, &caption);
+                        run.text = range_String(&caption);
+                        /* Center it. */
+                        run.visBounds.size.x = measureRange_Text(run.font, range_String(&caption)).bounds.size.x;
+                        run.visBounds.pos.x = d->size.x / 2 - run.visBounds.size.x / 2;
+                        deinit_String(&caption);
+                        pushBack_Array(&d->layout, &run);
+                        pos.y += run.visBounds.size.y + margin;
+                    }
                     break;
                 }
                 case audio_MediaType: {
@@ -1157,6 +1201,7 @@ void init_GmDocument(iGmDocument *d) {
     d->enableCommandLinks = iFalse;
     d->isLayoutInvalidated = iFalse;
     init_Array(&d->layout, sizeof(iGmRun));
+    init_StringArray(&d->auxText);
     init_PtrArray(&d->links);
     init_String(&d->title);
     init_Array(&d->headings, sizeof(iGmHeading));
@@ -1178,6 +1223,7 @@ void deinit_GmDocument(iGmDocument *d) {
     deinit_PtrArray(&d->links);
     deinit_Array(&d->preMeta);
     deinit_Array(&d->headings);
+    deinit_StringArray(&d->auxText);
     deinit_Array(&d->layout);
     deinit_String(&d->localHost);
     deinit_String(&d->url);
@@ -1228,8 +1274,8 @@ static void setDerivedThemeColors_(enum iGmDocumentTheme theme) {
               mix_Color(get_Color(tmQuoteIcon_ColorId), get_Color(tmBackground_ColorId), 0.4f));
     set_Color(tmBackgroundOpenLink_ColorId,
               mix_Color(get_Color(tmLinkText_ColorId), get_Color(tmBackground_ColorId), 0.90f));
-    set_Color(tmFrameOpenLink_ColorId,
-              mix_Color(get_Color(tmLinkText_ColorId), get_Color(tmBackground_ColorId), 0.75f));
+    set_Color(tmLinkFeedEntryDate_ColorId,
+              mix_Color(get_Color(tmLinkText_ColorId), get_Color(tmBackground_ColorId), 0.25f));
     if (theme == colorfulDark_GmDocumentTheme) {
         /* Ensure paragraph text and link text aren't too similarly colored. */
         if (delta_Color(get_Color(tmLinkText_ColorId), get_Color(tmParagraph_ColorId)) < 100) {
@@ -1715,9 +1761,12 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
 }
 
 void makePaletteGlobal_GmDocument(const iGmDocument *d) {
-    if (d->isPaletteValid) {
-        memcpy(get_Root()->tmPalette, d->palette, sizeof(d->palette));
+    if (!d->isPaletteValid) {
+        /* Recompute the palette since it's needed now. */
+        setThemeSeed_GmDocument((iGmDocument *) d, urlThemeSeed_String(&d->url));
     }
+    iAssert(d->isPaletteValid);
+    memcpy(get_Root()->tmPalette, d->palette, sizeof(d->palette));
 }
 
 void invalidatePalette_GmDocument(iGmDocument *d) {
@@ -1754,6 +1803,7 @@ static void markLinkRunsVisited_GmDocument_(iGmDocument *d, const iIntSet *linkI
     iForEach(Array, r, &d->layout) {
         iGmRun *run = r.value;
         if (run->linkId && !run->mediaId && contains_IntSet(linkIds, run->linkId)) {
+            /* TODO: Does this even work? The font IDs may be different. */
             if (run->font == bold_FontId) {
                 run->font = paragraph_FontId;
             }
@@ -1890,6 +1940,7 @@ static void normalize_GmDocument(iGmDocument *d) {
 void setUrl_GmDocument(iGmDocument *d, const iString *url) {
     url = canonicalUrl_String(url);
     set_String(&d->url, url);
+    setThemeSeed_GmDocument(d, urlThemeSeed_String(url));
     iUrl parts;
     init_Url(&parts, url);
     setRange_String(&d->localHost, parts.host);
@@ -1900,9 +1951,9 @@ void setUrl_GmDocument(iGmDocument *d, const iString *url) {
     }
 }
 
-static int replaceRegExp_String(iString *d, const iRegExp *regexp, const char *replacement,
-                                void (*matchHandler)(void *, const iRegExpMatch *),
-                                void *context) {
+int replaceRegExp_String(iString *d, const iRegExp *regexp, const char *replacement,
+                         void (*matchHandler)(void *, const iRegExpMatch *),
+                         void *context) {
     iRegExpMatch m;
     iString      result;
     int          numMatches = 0;
@@ -2103,6 +2154,7 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int
     if (size_String(source) == size_String(&d->unormSource)) {
         iAssert(equal_String(source, &d->unormSource));
 //        printf("[GmDocument] source is unchanged!\n");
+        updateWidth_GmDocument(d, width, canvasWidth);
         return; /* Nothing to do. */
     }
     /* Normalize and convert to Gemtext if needed. */
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 58fc3db3..eb02a26c 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -139,7 +139,7 @@ struct Impl_GmRun {
 
         uint32_t font      : 14;
         uint32_t mediaType : 3; /* note: max_MediaType means preformatted block */
-        uint32_t mediaId   : 11; /* zero if not an image */
+        uint32_t mediaId   : 11;
         uint32_t lineType  : 3;
         uint32_t isLede    : 1;
     };
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 23845475..3d5a4aef 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -585,8 +585,10 @@ void setUrl_GmRequest(iGmRequest *d, const iString *url) {
     /* TODO: Gemini spec allows UTF-8 encoded URLs, but still need to percent-encode non-ASCII
        characters? Could be a server-side issue, e.g., if they're using a URL parser meant for
        the web. */
-    urlEncodePath_String(&d->url);
-    urlEncodeSpaces_String(&d->url);
+    /* Encode everything except already-percent encoded characters. */
+    iString *enc = urlEncodeExclude_String(&d->url, "%" URL_RESERVED_CHARS);
+    set_String(&d->url, enc);
+    delete_String(enc);
     d->identity = identityForUrl_GmCerts(d->certs, &d->url);
 }
 
@@ -692,9 +694,11 @@ void submit_GmRequest(iGmRequest *d) {
             setCStr_String(&resp->meta, "text/gemini");
             iString *page = collectNew_String();
             iString *parentDir = collectNewRange_String(dirName_Path(path));
+#if !defined (iPlatformMobile)
             appendFormat_String(page, "=> %s " upArrow_Icon " %s" iPathSeparator "\n\n",
                                 cstrCollect_String(makeFileUrl_String(parentDir)),
                                 cstr_String(parentDir));
+#endif
             appendFormat_String(page, "# %s\n", cstr_Rangecc(baseName_Path(path)));
             /* Make a directory index page. */
             iPtrArray *sortedInfo = collectNew_PtrArray();
@@ -790,7 +794,8 @@ void submit_GmRequest(iGmRequest *d) {
                                                 cstr_String(containerUrl));
                             appendFormat_String(page, "# %s\n\n", cstr_Rangecc(containerName));
                             appendFormat_String(page,
-                                                cstrCount_Lang("archive.summary.n", numEntries_Archive(arch)),
+                                                cstrCount_Lang("archive.summary.n",
+                                                               (int) numEntries_Archive(arch)),
                                                 numEntries_Archive(arch),
                                                 (double) sourceSize_Archive(arch) / 1.0e6);
                             appendCStr_String(page, "\n\n");
@@ -802,7 +807,7 @@ void submit_GmRequest(iGmRequest *d) {
                             }
                             else if (size_StringSet(contents) > 1) {
                                 appendFormat_String(page, cstrCount_Lang("dir.summary.n",
-                                                                         size_StringSet(contents)),
+                                                                         (int) size_StringSet(contents)),
                                                     size_StringSet(contents));
                                 appendCStr_String(page, "\n\n");
                             }
diff --git a/src/gmutil.c b/src/gmutil.c
index 70a3608e..98e4d4d6 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -253,6 +253,17 @@ iRangecc urlRoot_String(const iString *d) {
     return (iRangecc){ constBegin_String(d), rootEnd };
 }
 
+const iBlock *urlThemeSeed_String(const iString *url) {
+    if (equalCase_Rangecc(urlScheme_String(url), "file")) {
+        return collect_Block(new_Block(0));
+    }
+    const iRangecc user = urlUser_String(url);
+    if (isEmpty_Range(&user)) {
+        return collect_Block(newRange_Block(urlHost_String(url)));
+    }
+    return collect_Block(newRange_Block(user));
+}
+
 static iBool isAbsolutePath_(iRangecc path) {
     return isAbsolute_Path(collect_String(urlDecode_String(collect_String(newRange_String(path)))));
 }
@@ -319,6 +330,28 @@ void urlEncodePath_String(iString *d) {
     delete_String(encoded);
 }
 
+void urlEncodeQuery_String(iString *d) {
+    iUrl url;
+    init_Url(&url, d);
+    if (isEmpty_Range(&url.query)) {
+        return;
+    }
+    iString encoded;
+    init_String(&encoded);
+    appendRange_String(&encoded, (iRangecc){ constBegin_String(d), url.query.start });
+    iString query;
+    url.query.start++; /* omit the question mark */
+    initRange_String(&query, url.query);
+    iString *encQuery = urlEncode_String(&query); /* fully encoded */
+    appendCStr_String(&encoded, "?");
+    append_String(&encoded, encQuery);    
+    delete_String(encQuery);
+    deinit_String(&query);
+    appendRange_String(&encoded, (iRangecc){ url.query.end, constEnd_String(d) });
+    set_String(d, &encoded);
+    deinit_String(&encoded);
+}
+
 iBool isKnownScheme_Rangecc(iRangecc scheme) {
     if (isKnownUrlScheme_Rangecc(scheme)) {
         return iTrue;
@@ -651,25 +684,25 @@ const iString *withSpacesEncoded_String(const iString *d) {
 const iString *canonicalUrl_String(const iString *d) {
     /* The "canonical" form, used for internal storage and comparisons, is:
        - all non-reserved characters decoded (i.e., it's an IRI)
-       - expect for spaces, which are always `%20`
+       - except spaces, which are always `%20`
        This means a canonical URL can be used on a gemtext link line without modifications. */
     iString *canon = NULL;
     iUrl parts;
     init_Url(&parts, d);
-    /* Colons are in decoded form in the URL path. */
+    /* Colons (0x3a) are in decoded form in the URL path. */
     if (iStrStrN(parts.path.start, "%3A", size_Range(&parts.path)) ||
         iStrStrN(parts.path.start, "%3a", size_Range(&parts.path))) {
         /* This is done separately to avoid the copy if %3A is not present; it's rare. */
         canon = copy_String(d);
         urlDecodePath_String(canon);
-        iString *dec = maybeUrlDecodeExclude_String(canon, "%/?:;#&+= "); /* decode everything else in all parts */
+        iString *dec = maybeUrlDecodeExclude_String(canon, "% " URL_RESERVED_CHARS); /* decode everything else in all parts */
         if (dec) {
             set_String(canon, dec);
             delete_String(dec);
         }
     }
     else {
-        canon = maybeUrlDecodeExclude_String(d, "%/?:;#&+= ");
+        canon = maybeUrlDecodeExclude_String(d, "% " URL_RESERVED_CHARS);
     }
     /* `canon` may now be NULL if nothing was decoded. */
     if (indexOfCStr_String(canon ? canon : d, " ") != iInvalidPos ||
@@ -678,7 +711,7 @@ const iString *canonicalUrl_String(const iString *d) {
             canon = copy_String(d);
         }
         urlEncodeSpaces_String(canon);
-    }
+    }    
     return canon ? collect_String(canon) : d;
 }
 
diff --git a/src/gmutil.h b/src/gmutil.h
index 6b10b444..15bb7b2e 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -27,6 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 iDeclareType(GmError)
 iDeclareType(RegExp)
+iDeclareType(RegExpMatch)
 iDeclareType(Url)
 
 /* Response status codes. */
@@ -99,6 +100,7 @@ iRegExp *       newGemtextLink_RegExp   (void);
 
 #define GEMINI_DEFAULT_PORT         ((uint16_t) 1965)
 #define GEMINI_DEFAULT_PORT_CSTR    "1965"
+#define URL_RESERVED_CHARS          ":/?#[]@!$&'()*+,;=" /* RFC 3986 */
 
 struct Impl_Url {
     iRangecc scheme;
@@ -117,6 +119,8 @@ iRangecc        urlHost_String          (const iString *);
 uint16_t        urlPort_String          (const iString *);
 iRangecc        urlUser_String          (const iString *);
 iRangecc        urlRoot_String          (const iString *);
+const iBlock *  urlThemeSeed_String     (const iString *);
+
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
 iBool           isLikelyUrl_String      (const iString *);
 iBool           isKnownScheme_Rangecc   (iRangecc scheme); /* any URI scheme */
@@ -128,6 +132,7 @@ const iString * urlFragmentStripped_String(const iString *);
 const iString * urlQueryStripped_String (const iString *);
 void            urlDecodePath_String    (iString *);
 void            urlEncodePath_String    (iString *);
+void            urlEncodeQuery_String   (iString *);
 iString *       makeFileUrl_String      (const iString *localFilePath);
 const char *    makeFileUrl_CStr        (const char *localFilePath);
 iString *       localFilePathFromUrl_String(const iString *);
@@ -143,3 +148,8 @@ const iString * findContainerArchive_Path           (const iString *path);
 
 
 const iString * feedEntryOpenCommand_String (const iString *url, int newTab); /* checks fragment */
+
+/* TODO: Consider adding this to the_Foundation. */
+int     replaceRegExp_String    (iString *, const iRegExp *regexp, const char *replacement,
+                                 void (*matchHandler)(void *, const iRegExpMatch *),
+                                 void *context);
diff --git a/src/history.c b/src/history.c
index 7185912f..56454009 100644
--- a/src/history.c
+++ b/src/history.c
@@ -37,7 +37,7 @@ void init_RecentUrl(iRecentUrl *d) {
     d->normScrollY    = 0;
     d->cachedResponse = NULL;
     d->cachedDoc      = NULL;
-    d->flags.openedFromSidebar = iFalse;
+    d->flags          = 0;
 }
 
 void deinit_RecentUrl(iRecentUrl *d) {
@@ -110,6 +110,14 @@ iHistory *copy_History(const iHistory *d) {
     return copy;
 }
 
+void lock_History(iHistory *d) {
+    lock_Mutex(d->mtx);
+}
+
+void unlock_History(iHistory *d) {
+    unlock_Mutex(d->mtx);
+}
+
 iMemInfo memoryUsage_History(const iHistory *d) {
     iMemInfo mem = { 0, 0 };
     iConstForEach(Array, i, &d->recent) {
@@ -173,7 +181,7 @@ void serialize_History(const iHistory *d, iStream *outs) {
         const iRecentUrl *item = i.value;
         serialize_String(&item->url, outs);
         write32_Stream(outs, item->normScrollY * 1.0e6f);
-        writeU16_Stream(outs, item->flags.openedFromSidebar ? iBit(1) : 0);
+        writeU16_Stream(outs, item->flags);
         if (item->cachedResponse) {
             write8_Stream(outs, 1);
             serialize_GmResponse(item->cachedResponse, outs);
@@ -197,10 +205,7 @@ void deserialize_History(iHistory *d, iStream *ins) {
         set_String(&item.url, canonicalUrl_String(&item.url));
         item.normScrollY = (float) read32_Stream(ins) / 1.0e6f;
         if (version_Stream(ins) >= addedRecentUrlFlags_FileVersion) {
-            uint16_t flags = readU16_Stream(ins);
-            if (flags & iBit(1)) {
-                item.flags.openedFromSidebar = iTrue;
-            }
+            item.flags = readU16_Stream(ins);
         }
         if (read8_Stream(ins)) {
             item.cachedResponse = new_GmResponse();
@@ -246,18 +251,26 @@ const iString *url_History(const iHistory *d, size_t pos) {
     return collectNew_String();
 }
 
-iRecentUrl *findUrl_History(iHistory *d, const iString *url) {
+#if 0
+iRecentUrl *findUrl_History(iHistory *d, const iString *url, int timeDir) {
     url = canonicalUrl_String(url);
+//    if (!timeDir) {
+//        timeDir = -1;
+//    }
     lock_Mutex(d->mtx);
-    iReverseForEach(Array, i, &d->recent) {
-        if (cmpStringCase_String(url, &((iRecentUrl *) i.value)->url) == 0) {
+    for (size_t i = size_Array(&d->recent) - 1 - d->recentPos; i < size_Array(&d->recent);
+         i += timeDir) {
+        iRecentUrl *item = at_Array(&d->recent, i);
+        if (cmpStringCase_String(url, &item->url) == 0) {
             unlock_Mutex(d->mtx);
-            return i.value;
+            return item; /* FIXME: Returning an internal pointer; should remain locked. */
         }
+        if (!timeDir) break;
     }
     unlock_Mutex(d->mtx);
     return NULL;
 }
+#endif
 
 void replace_History(iHistory *d, const iString *url) {
     url = canonicalUrl_String(url);
@@ -297,20 +310,31 @@ void add_History(iHistory *d, const iString *url) {
     unlock_Mutex(d->mtx);
 }
 
-iBool preceding_History(iHistory *d, iRecentUrl *recent_out) {
-    iBool ok = iFalse;
+void undo_History(iHistory *d) {
     lock_Mutex(d->mtx);
-    if (!isEmpty_Array(&d->recent) && d->recentPos < size_Array(&d->recent) - 1) {
-        const iRecentUrl *recent = constAt_Array(&d->recent, size_Array(&d->recent) - 1 -
-                                                 (d->recentPos + 1));
-        set_String(&recent_out->url, &recent->url);
-        recent_out->normScrollY = recent->normScrollY;
-        iChangeRef(recent_out->cachedDoc, recent->cachedDoc);
+    if (!isEmpty_Array(&d->recent) || d->recentPos != 0) {
+        deinit_RecentUrl(back_Array(&d->recent));
+        popBack_Array(&d->recent);
+    }
+    unlock_Mutex(d->mtx);    
+}
+
+iRecentUrl *precedingLocked_History(iHistory *d) {
+    /* NOTE: Manual lock and unlock are required when using this; returning an internal pointer. */
+    iBool ok = iFalse;
+    //lock_Mutex(d->mtx);
+    const size_t lastIndex = size_Array(&d->recent) - 1;
+    if (!isEmpty_Array(&d->recent) && d->recentPos < lastIndex) {
+        return at_Array(&d->recent, lastIndex - (d->recentPos + 1));
+//        set_String(&recent_out->url, &recent->url);
+//        recent_out->normScrollY = recent->normScrollY;
+//        iChangeRef(recent_out->cachedDoc, recent->cachedDoc);
         /* Cached response is not returned, would involve a deep copy. */
-        ok = iTrue;
+//        ok = iTrue;
     }
-    unlock_Mutex(d->mtx);
-    return ok;
+    //unlock_Mutex(d->mtx);
+//    return ok;
+    return NULL;
 }
 
 #if 0
@@ -360,7 +384,7 @@ iBool goForward_History(iHistory *d) {
     return iFalse;
 }
 
-iBool atLatest_History(const iHistory *d) {
+iBool atNewest_History(const iHistory *d) {
     iBool isLatest;
     iGuardMutex(d->mtx, isLatest = (d->recentPos == 0));
     return isLatest;
@@ -391,12 +415,18 @@ void setCachedResponse_History(iHistory *d, const iGmResponse *response) {
     unlock_Mutex(d->mtx);
 }
 
-void setCachedDocument_History(iHistory *d, iGmDocument *doc, iBool openedFromSidebar) {
+void setCachedDocument_History(iHistory *d, iGmDocument *doc) {
     lock_Mutex(d->mtx);
     iRecentUrl *item = mostRecentUrl_History(d);
+    iAssert(size_GmDocument(doc).x > 0);
     if (item) {
-        iAssert(equal_String(url_GmDocument(doc), &item->url));
-        item->flags.openedFromSidebar = openedFromSidebar;
+#if !defined (NDEBUG)
+        if (!equal_String(url_GmDocument(doc), &item->url)) {
+            printf("[History] Cache mismatch! Expecting data for item {%s} but document URL is {%s}\n",
+                   cstr_String(&item->url),
+                   cstr_String(url_GmDocument(doc)));
+        }
+#endif
         if (item->cachedDoc != doc) {
             iRelease(item->cachedDoc);
             item->cachedDoc = ref_Object(doc);
diff --git a/src/history.h b/src/history.h
index d3daae80..7959187d 100644
--- a/src/history.h
+++ b/src/history.h
@@ -39,9 +39,7 @@ struct Impl_RecentUrl {
     float        normScrollY;    /* normalized to document height */
     iGmResponse *cachedResponse; /* kept in memory for quicker back navigation */
     iGmDocument *cachedDoc;      /* cached copy of the presentation: layout and media (not serialized) */
-    struct {
-        uint8_t openedFromSidebar : 1;
-    } flags;
+    uint16_t     flags;
 };
 
 iDeclareType(MemInfo)
@@ -58,19 +56,21 @@ iDeclareTypeConstruction(History)
 iDeclareTypeSerialization(History)
 
 iHistory *  copy_History                (const iHistory *);
+void        lock_History                (iHistory *);
+void        unlock_History              (iHistory *);
 
 void        clear_History               (iHistory *);
 void        add_History                 (iHistory *, const iString *url);
+void        undo_History                (iHistory *); /* removes the most recent URL */
 void        replace_History             (iHistory *, const iString *url);
 void        setCachedResponse_History   (iHistory *, const iGmResponse *response);
-void        setCachedDocument_History   (iHistory *, iGmDocument *doc, iBool openedFromSidebar);
+void        setCachedDocument_History   (iHistory *, iGmDocument *doc);
 iBool       goBack_History              (iHistory *);
 iBool       goForward_History           (iHistory *);
-iBool       preceding_History           (iHistory *d, iRecentUrl *recent_out);
-//iBool       following_History           (iHistory *d, iRecentUrl *recent_out);
+iRecentUrl *precedingLocked_History     (iHistory *); /* requires manual lock/unlock! */
 iRecentUrl *recentUrl_History           (iHistory *, size_t pos);
 iRecentUrl *mostRecentUrl_History       (iHistory *);
-iRecentUrl *findUrl_History             (iHistory *, const iString *url);
+//iRecentUrl *findUrl_History             (iHistory *, const iString *url, int timeDir);
 
 void        clearCache_History                  (iHistory *);
 size_t      pruneLeastImportant_History         (iHistory *);
@@ -78,7 +78,7 @@ size_t      pruneLeastImportantMemory_History   (iHistory *);
 void        invalidateTheme_History             (iHistory *); /* theme has changed, cached contents need updating */
 void        invalidateCachedLayout_History      (iHistory *);
 
-iBool       atLatest_History            (const iHistory *);
+iBool       atNewest_History            (const iHistory *);
 iBool       atOldest_History            (const iHistory *);
 
 const iStringArray *   searchContents_History   (const iHistory *, const iRegExp *pattern); /* chronologically ascending */
diff --git a/src/ios.h b/src/ios.h
index 85177409..9860f7a2 100644
--- a/src/ios.h
+++ b/src/ios.h
@@ -38,6 +38,8 @@ void    playHapticEffect_iOS    (enum iHapticEffect effect);
 void    exportDownloadedFile_iOS(const iString *path);
 void    pickFileForOpening_iOS  (void);
 void    pickFile_iOS            (const char *command); /* ` path:%s` will be appended */
+void    openTextActivityView_iOS(const iString *text);
+void    openFileActivityView_iOS(const iString *path);
 
 iBool   isPhone_iOS             (void);
 void    safeAreaInsets_iOS      (float *left, float *top, float *right, float *bottom);
@@ -61,3 +63,30 @@ iBool   isPaused_AVFAudioPlayer     (const iAVFAudioPlayer *);
 
 void    clearNowPlayingInfo_iOS     (void);
 void    updateNowPlayingInfo_iOS    (void);
+
+/*----------------------------------------------------------------------------------------------*/
+
+enum iSystemTextInputFlags {
+    selectAll_SystemTextInputFlags         = iBit(1),
+    multiLine_SystemTextInputFlags         = iBit(2),
+    returnGo_SystemTextInputFlags          = iBit(3),
+    returnSend_SystemTextInputFlags        = iBit(4),
+    disableAutocorrect_SystemTextInputFlag = iBit(5),
+    disableAutocapitalize_SystemTextInputFlag = iBit(6),
+    alignRight_SystemTextInputFlag         = iBit(7),
+    insertNewlines_SystemTextInputFlag     = iBit(8),
+    extraPadding_SystemTextInputFlag       = iBit(9),
+};
+
+iDeclareType(SystemTextInput)
+iDeclareTypeConstructionArgs(SystemTextInput, iRect rect, int flags)
+
+void    setRect_SystemTextInput  (iSystemTextInput *, iRect rect);
+void    setText_SystemTextInput  (iSystemTextInput *, const iString *text, iBool allowUndo);
+void    setFont_SystemTextInput  (iSystemTextInput *, int fontId);
+void    setTextChangedFunc_SystemTextInput
+                                 (iSystemTextInput *, void (*textChangedFunc)(iSystemTextInput *, void *), void *);
+void    selectAll_SystemTextInput(iSystemTextInput *);
+
+const iString * text_SystemTextInput    (const iSystemTextInput *);
+int     preferredHeight_SystemTextInput (const iSystemTextInput *);
diff --git a/src/ios.m b/src/ios.m
index b46fb8dc..82596ffd 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "audio/player.h"
 #include "ui/command.h"
 #include "ui/window.h"
+#include "ui/touch.h"
 
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
@@ -60,6 +61,9 @@ static UIViewController *viewController_(iWindow *window) {
     return NULL;
 }
 
+static void notifyChange_SystemTextInput_(iSystemTextInput *);
+static BOOL isNewlineAllowed_SystemTextInput_(const iSystemTextInput *);
+
 /*----------------------------------------------------------------------------------------------*/
 
 API_AVAILABLE(ios(13.0))
@@ -159,9 +163,10 @@ API_AVAILABLE(ios(13.0))
 
 /*----------------------------------------------------------------------------------------------*/
 
-@interface AppState : NSObject<UIDocumentPickerDelegate> {
+@interface AppState : NSObject<UIDocumentPickerDelegate, UITextFieldDelegate, UITextViewDelegate> {
     iString *fileBeingSaved;
     iString *pickFileCommand;
+    iSystemTextInput *sysCtrl;
 }
 @property (nonatomic, assign) BOOL isHapticsAvailable;
 @property (nonatomic, strong) NSObject *haptic;
@@ -175,9 +180,18 @@ static AppState *appState_;
     self = [super init];
     fileBeingSaved = NULL;
     pickFileCommand = NULL;
+    sysCtrl = NULL;
     return self;
 }
 
+-(void)setSystemTextInput:(iSystemTextInput *)sys {
+    sysCtrl = sys;
+}
+
+-(iSystemTextInput *)systemTextInput {
+    return sysCtrl;
+}
+
 -(void)setPickFileCommand:(const char *)command {
     if (!pickFileCommand) {
         pickFileCommand = new_String();
@@ -256,6 +270,46 @@ didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
 -(void)keyboardOffScreen:(NSNotification *)notification {
     setKeyboardHeight_MainWindow(get_MainWindow(), 0);
 }
+
+static void sendReturnKeyPress_(void) {
+    SDL_Event ev = { .type = SDL_KEYDOWN };
+    ev.key.timestamp = SDL_GetTicks();
+    ev.key.keysym.sym = SDLK_RETURN;
+    ev.key.state = SDL_PRESSED;
+    SDL_PushEvent(&ev);
+    ev.type = SDL_KEYUP;
+    ev.key.state = SDL_RELEASED;
+    SDL_PushEvent(&ev);
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    sendReturnKeyPress_();
+    return NO;
+}
+
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range
+replacementString:(NSString *)string {
+    iSystemTextInput *sysCtrl = [appState_ systemTextInput];
+    notifyChange_SystemTextInput_(sysCtrl);
+    return YES;
+}
+
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range
+ replacementText:(NSString *)text {
+    if ([text isEqualToString:@"\n"]) {
+        if (!isNewlineAllowed_SystemTextInput_([appState_ systemTextInput])) {
+            sendReturnKeyPress_();
+            return NO;
+        }
+    }
+    return YES;
+}
+
+- (void)textViewDidChange:(UITextView *)textView {
+    iSystemTextInput *sysCtrl = [appState_ systemTextInput];
+    notifyChange_SystemTextInput_(sysCtrl);
+}
+
 @end
 
 static void enableMouse_(iBool yes) {
@@ -483,6 +537,35 @@ void pickFile_iOS(const char *command) {
     [viewController_(get_Window()) presentViewController:picker animated:YES completion:nil];
 }
 
+static void openActivityView_(NSArray *activityItems) {
+    UIActivityViewController *actView =
+        [[UIActivityViewController alloc]
+         initWithActivityItems:activityItems
+         applicationActivities:nil];
+    iWindow *win = get_Window();
+    UIViewController *viewCtl = viewController_(win);
+    UIPopoverPresentationController *popover = [actView popoverPresentationController];
+    if (popover) {
+        [popover setSourceView:[viewCtl view]];
+        iInt2 tapPos = latestTapPosition_Touch();
+        tapPos.x /= win->pixelRatio;
+        tapPos.y /= win->pixelRatio;
+        [popover setSourceRect:(CGRect){{tapPos.x - 10, tapPos.y - 10}, {20, 20}}];
+        [popover setCanOverlapSourceViewRect:YES];
+    }
+    [viewCtl presentViewController:actView animated:YES completion:nil];
+}
+
+void openTextActivityView_iOS(const iString *text) {
+    openActivityView_(@[[NSString stringWithUTF8String:cstr_String(text)]]);
+}
+
+void openFileActivityView_iOS(const iString *path) {
+    NSURL *url = [NSURL fileURLWithPath:[[NSString alloc] initWithCString:cstr_String(path)
+                                                                 encoding:NSUTF8StringEncoding]];
+    openActivityView_(@[url]);
+}
+
 /*----------------------------------------------------------------------------------------------*/
 
 enum iAVFAudioPlayerState {
@@ -511,6 +594,10 @@ void init_AVFAudioPlayer(iAVFAudioPlayer *d) {
 
 void deinit_AVFAudioPlayer(iAVFAudioPlayer *d) {
     setInput_AVFAudioPlayer(d, NULL, NULL);
+    if (d->player) {
+        CFBridgingRelease(d->player);
+        d->player = nil;
+    }
 }
 
 static const char *cacheDir_ = "~/Library/Caches/Audio";
@@ -607,3 +694,233 @@ iBool isStarted_AVFAudioPlayer(const iAVFAudioPlayer *d) {
 iBool isPaused_AVFAudioPlayer(const iAVFAudioPlayer *d) {
     return d->state == paused_AVFAudioPlayerState;
 }
+
+/*----------------------------------------------------------------------------------------------*/
+
+struct Impl_SystemTextInput {
+    int flags;
+    void *field; /* single-line text field */
+    void *view;  /* multi-line text view */
+    void (*textChangedFunc)(iSystemTextInput *, void *);
+    void *textChangedContext;
+};
+
+iDefineTypeConstructionArgs(SystemTextInput, (iRect rect, int flags), rect, flags)
+
+#define REF_d_field  (__bridge UITextField *)d->field
+#define REF_d_view   (__bridge UITextView *)d->view
+
+static CGRect convertToCGRect_(const iRect *rect, iBool expanded) {
+    const iWindow *win = get_Window();
+    CGRect frame;
+    // TODO: Convert coordinates properly!
+    frame.origin.x = rect->pos.x / win->pixelRatio;
+    frame.origin.y = (rect->pos.y - gap_UI + 1) / win->pixelRatio;
+    frame.size.width = rect->size.x / win->pixelRatio;
+    frame.size.height = rect->size.y / win->pixelRatio;
+    /* Some padding to account for insets. If we just zero out the insets, the insertion point
+       may be clipped at the edges. */
+    if (expanded) {
+        const float inset = gap_UI / get_Window()->pixelRatio;
+        frame.origin.x -= inset + 1;
+        frame.origin.y -= inset + 1;
+        frame.size.width += 2 * inset + 2;
+        frame.size.height += inset + 1 + inset;
+    }
+    return frame;
+}
+
+static UIColor *makeUIColor_(enum iColorId colorId) {
+    iColor color = get_Color(colorId);
+    return [UIColor colorWithRed:color.r / 255.0
+                           green:color.g / 255.0
+                            blue:color.b / 255.0
+                           alpha:color.a / 255.0];
+}
+
+void init_SystemTextInput(iSystemTextInput *d, iRect rect, int flags) {
+    d->flags = flags;
+    d->field = NULL;
+    d->view  = NULL;
+    CGRect frame = convertToCGRect_(&rect, (flags & multiLine_SystemTextInputFlags) != 0);
+    if (flags & multiLine_SystemTextInputFlags) {
+        d->view = (void *) CFBridgingRetain([[UITextView alloc] initWithFrame:frame textContainer:nil]);
+        [[viewController_(get_Window()) view] addSubview:REF_d_view];
+    }
+    else {
+        d->field = (void *) CFBridgingRetain([[UITextField alloc] initWithFrame:frame]);
+        [[viewController_(get_Window()) view] addSubview:REF_d_field];
+    }
+    UIControl<UITextInputTraits> *traits = (UIControl<UITextInputTraits> *) (d->view ? REF_d_view : REF_d_field);
+    if (~flags & insertNewlines_SystemTextInputFlag) {
+        [traits setReturnKeyType:UIReturnKeyDone];
+    }
+    if (flags & returnGo_SystemTextInputFlags) {
+        [traits setReturnKeyType:UIReturnKeyGo];
+    }
+    if (flags & returnSend_SystemTextInputFlags) {
+        [traits setReturnKeyType:UIReturnKeySend];
+    }
+    if (flags & disableAutocorrect_SystemTextInputFlag) {
+        [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+        [traits setSpellCheckingType:UITextSpellCheckingTypeNo];
+    }
+    if (flags & disableAutocapitalize_SystemTextInputFlag) {
+        [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+    }
+    if (flags & alignRight_SystemTextInputFlag) {
+        if (d->field) {
+            [REF_d_field setTextAlignment:NSTextAlignmentRight];
+        }
+        if (d->view) {
+            [REF_d_view setTextAlignment:NSTextAlignmentRight];
+        }
+    }
+    UIColor *textColor = makeUIColor_(uiInputTextFocused_ColorId);
+    UIColor *backgroundColor = makeUIColor_(uiInputBackgroundFocused_ColorId);
+    UIColor *tintColor = makeUIColor_(uiInputFrameHover_ColorId); /* use the accent color */ //uiInputCursor_ColorId);
+    [appState_ setSystemTextInput:d];
+    if (d->field) {
+        UITextField *field = REF_d_field;
+        [field setTextColor:textColor];
+        [field setTintColor:tintColor];
+        [field setDelegate:appState_];
+        [field becomeFirstResponder];
+    }
+    else {
+        UITextView *view = REF_d_view;
+        [view setBackgroundColor:[UIColor colorWithWhite:1.0f alpha:0.0f]];
+        [view setTextColor:textColor];
+        [view setTintColor:tintColor];
+        if (flags & extraPadding_SystemTextInputFlag) {
+            [view setContentInset:(UIEdgeInsets){ 0, 0, 3 * gap_UI / get_Window()->pixelRatio, 0}];
+        }
+        [view setEditable:YES];
+        [view setDelegate:appState_];
+        [view becomeFirstResponder];
+    }
+    d->textChangedFunc = NULL;
+    d->textChangedContext = NULL;
+}
+
+void deinit_SystemTextInput(iSystemTextInput *d) {
+    [appState_ setSystemTextInput:nil];
+    if (d->field) {
+        [REF_d_field removeFromSuperview];
+        CFBridgingRelease(d->field);
+        d->field = nil;
+    }
+    if (d->view) {
+        [REF_d_view removeFromSuperview];
+        CFBridgingRelease(d->view);
+        d->view = nil;
+    }
+}
+
+void selectAll_SystemTextInput(iSystemTextInput *d) {
+    if (d->field) {
+        [REF_d_field selectAll:nil];
+    }
+    if (d->view) {
+        [REF_d_view selectAll:nil];
+    }
+}
+
+void setText_SystemTextInput(iSystemTextInput *d, const iString *text, iBool allowUndo) {
+    NSString *str = [NSString stringWithUTF8String:cstr_String(text)];
+    if (d->field) {
+        [REF_d_field setText:str];
+        if (d->flags & selectAll_SystemTextInputFlags) {
+            [REF_d_field selectAll:nil];
+        }
+    }
+    else {
+        UITextView *view = REF_d_view;
+//        if (allowUndo) {
+//            [view selectAll:nil];
+//            if ([view shouldChangeTextInRange:[view selectedTextRange] replacementText:@""]) {
+//                [[view textStorage] beginEditing];
+//                [[view textStorage] replaceCharactersInRange:[view selectedRange] withString:@""];
+//                [[view textStorage] endEditing];
+//            }
+//        }
+//        else {
+        // TODO: How to implement `allowUndo`, given that UITextView does not exist when unfocused?
+        // Maybe keep the UITextStorage (if it has the undo?)?
+        [view setText:str];
+//        }
+        if (d->flags & selectAll_SystemTextInputFlags) {
+            [view selectAll:nil];
+        }
+    }
+}
+
+int preferredHeight_SystemTextInput(const iSystemTextInput *d) {
+    if (d->view) {
+        CGRect usedRect = [[REF_d_view layoutManager] usedRectForTextContainer:[REF_d_view textContainer]];
+        return usedRect.size.height * get_Window()->pixelRatio;
+    }
+    return 0;
+}
+
+void setFont_SystemTextInput(iSystemTextInput *d, int fontId) {
+    float height = lineHeight_Text(fontId) / get_Window()->pixelRatio;
+    UIFont *font;
+    //        for (NSString *name in [UIFont familyNames]) {
+    //            printf("family: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
+    //        }
+    if (fontId / maxVariants_Fonts * maxVariants_Fonts == monospace_FontId) {
+//        font = [UIFont monospacedSystemFontOfSize:0.8f * height weight:UIFontWeightRegular];
+//        for (NSString *name in [UIFont fontNamesForFamilyName:@"Iosevka Term"]) {
+//            printf("fontname: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
+//        }
+        font = [UIFont fontWithName:@"Iosevka-Term-Extended" size:height * 0.82f];
+    }
+    else {
+//        font = [UIFont systemFontOfSize:0.65f * height];
+        font = [UIFont fontWithName:@"SourceSans3-Regular" size:height * 0.7f];
+    }
+    if (d->field) {
+        [REF_d_field setFont:font];
+    }
+    if (d->view) {
+        [REF_d_view setFont:font];
+    }
+}
+
+const iString *text_SystemTextInput(const iSystemTextInput *d) {
+    if (d->field) {
+        return collectNewCStr_String([[REF_d_field text] cStringUsingEncoding:NSUTF8StringEncoding]);
+    }
+    if (d->view) {
+        return collectNewCStr_String([[REF_d_view text] cStringUsingEncoding:NSUTF8StringEncoding]);
+    }
+    return NULL;
+}
+
+void setRect_SystemTextInput(iSystemTextInput *d, iRect rect) {
+    CGRect frame = convertToCGRect_(&rect, (d->flags & multiLine_SystemTextInputFlags) != 0);
+    if (d->field) {
+        [REF_d_field setFrame:frame];
+    }
+    else {
+        [REF_d_view setFrame:frame];
+    }
+}
+
+void setTextChangedFunc_SystemTextInput(iSystemTextInput *d,
+                                        void (*textChangedFunc)(iSystemTextInput *, void *),
+                                        void *context) {
+    d->textChangedFunc = textChangedFunc;
+    d->textChangedContext = context;
+}
+
+static void notifyChange_SystemTextInput_(iSystemTextInput *d) {
+    if (d && d->textChangedFunc) {
+        d->textChangedFunc(d, d->textChangedContext);
+    }
+}
+
+static BOOL isNewlineAllowed_SystemTextInput_(const iSystemTextInput *d) {
+    return (d->flags & insertNewlines_SystemTextInputFlag) != 0;
+}
diff --git a/src/macos.h b/src/macos.h
index 22a6dfff..10cbba81 100644
--- a/src/macos.h
+++ b/src/macos.h
@@ -39,8 +39,10 @@ void    hideTitleBar_MacOS          (iWindow *window);
 void    insertMenuItems_MacOS       (const char *menuLabel, int atIndex, const iMenuItem *items, size_t count);
 void    removeMenu_MacOS            (int atIndex);
 void    enableMenu_MacOS            (const char *menuLabel, iBool enable);
+void    enableMenuIndex_MacOS       (int index, iBool enable);
 void    enableMenuItem_MacOS        (const char *menuItemCommand, iBool enable);
 void    enableMenuItemsByKey_MacOS  (int key, int kmods, iBool enable);
+void    enableMenuItemsOnHomeRow_MacOS(iBool enable);
 void    handleCommand_MacOS         (const char *cmd);
 
 void    showPopupMenu_MacOS         (iWidget *source, iInt2 windowCoord, const iMenuItem *items, size_t n);
diff --git a/src/macos.m b/src/macos.m
index cfbca488..4ad267c1 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include <SDL_timer.h>
 #include <SDL_syswm.h>
+#include <the_Foundation/stringset.h>
 
 #import <AppKit/AppKit.h>
 
@@ -110,7 +111,7 @@ static void ignoreImmediateKeyDownEvents_(void) {
 - (id)initWithIdentifier:(NSTouchBarItemIdentifier)identifier
                    title:(NSString *)title
                  command:(NSString *)cmd {
-    [super initWithIdentifier:identifier];
+    self = [super initWithIdentifier:identifier];
     self.view = [NSButton buttonWithTitle:title target:self action:@selector(buttonPressed)];
     command = cmd;
     return self;
@@ -120,7 +121,7 @@ static void ignoreImmediateKeyDownEvents_(void) {
                    image:(NSImage *)image
                   widget:(iWidget *)widget
                  command:(NSString *)cmd {
-    [super initWithIdentifier:identifier];
+    self = [super initWithIdentifier:identifier];
     self.view = [NSButton buttonWithImage:image target:self action:@selector(buttonPressed)];
     command = cmd;
     return self;
@@ -163,12 +164,13 @@ static void ignoreImmediateKeyDownEvents_(void) {
 @implementation MenuCommands
 
 - (id)init {
+    self = [super init];
     commands = [[NSMutableDictionary<NSString *, NSString *> alloc] init];
     source = NULL;
     return self;
 }
 
-- (void)setCommand:(NSString *)command forMenuItem:(NSMenuItem *)menuItem {
+- (void)setCommand:(NSString * __nonnull)command forMenuItem:(NSMenuItem * __nonnull)menuItem {
     [commands setObject:command forKey:[menuItem title]];
 }
 
@@ -220,7 +222,7 @@ static void ignoreImmediateKeyDownEvents_(void) {
 @implementation MyDelegate
 
 - (id)initWithSDLDelegate:(NSObject<NSApplicationDelegate> *)sdl {
-    [super init];
+    self = [super init];
     currentAppearanceName = nil;
     menuCommands = [[MenuCommands alloc] init];
     touchBarVariant = default_TouchBarVariant;
@@ -402,6 +404,131 @@ void registerURLHandler_MacOS(void) {
     [handler release];
 }
 
+#if 0
+static iBool isTracking_;
+
+static void trackSwipe_(NSEvent *event) {
+    if (isTracking_) {
+        return;
+    }
+    isTracking_ = iTrue;
+    [event trackSwipeEventWithOptions:NSEventSwipeTrackingLockDirection
+             dampenAmountThresholdMin:-1.0
+                                  max:1.0
+                         usingHandler:^(CGFloat gestureAmount, NSEventPhase phase,
+                                        BOOL isComplete, BOOL *stop) {
+                        printf("TRACK: amount:%f phase:%lu complete:%d\n",
+                               gestureAmount, (unsigned long) phase, isComplete);
+                        fflush(stdout);
+                        if (isComplete) {
+                            isTracking_ = iFalse;
+                        }
+                      }
+    ];
+}
+#endif
+
+static int swipeDir_ = 0;
+static int preventTapGlitch_ = 0;
+
+static iBool processScrollWheelEvent_(NSEvent *event) {
+    const iBool isPerPixel = (event.hasPreciseScrollingDeltas != 0);
+    const iBool isInertia  = (event.momentumPhase & (NSEventPhaseBegan | NSEventPhaseChanged)) != 0;
+    const iBool isEnded    = event.scrollingDeltaX == 0.0f && event.scrollingDeltaY == 0.0f && !isInertia;
+    const iWindow *win     = &get_MainWindow()->base;
+    if (isPerPixel) {
+        /* On macOS 12.1, stopping ongoing inertia scroll with a tap seems to sometimes produce
+           spurious large scroll events. */
+        switch (preventTapGlitch_) {
+            case 0:
+                if (isInertia && event.momentumPhase == NSEventPhaseChanged) {
+                    preventTapGlitch_++;
+                }
+                else {
+                    preventTapGlitch_ = 0;
+                }
+                break;
+            case 1:
+                if (event.scrollingDeltaY == 0 && event.momentumPhase == NSEventPhaseEnded) {
+                    preventTapGlitch_++;
+                }
+                break;
+            case 2:
+                if (event.scrollingDeltaY == 0 && event.momentumPhase == 0 && isEnded) {
+                    preventTapGlitch_++;
+                }
+                else {
+                    preventTapGlitch_ = 0;
+                }
+                break;
+            case 3:
+                if (event.scrollingDeltaY != 0 && event.momentumPhase == 0 && !isInertia) {
+                    preventTapGlitch_ = 0;
+                    // printf("SPURIOUS\n"); fflush(stdout);
+                    return iTrue;
+                }
+                preventTapGlitch_ = 0;
+                break;
+        }
+    }
+    /* Post corresponding MOUSEWHEEL events. */
+    SDL_MouseWheelEvent e = { .type = SDL_MOUSEWHEEL };
+    e.timestamp = SDL_GetTicks();
+    e.which = isPerPixel ? 0 : 1; /* Distinction between trackpad and regular mouse. TODO: Still needed? */
+    setPerPixel_MouseWheelEvent(&e, isPerPixel);
+    if (isPerPixel) {
+        setInertia_MouseWheelEvent(&e, isInertia);
+        setScrollFinished_MouseWheelEvent(&e, isEnded);
+        e.x = event.scrollingDeltaX * win->pixelRatio;
+        e.y = event.scrollingDeltaY * win->pixelRatio;        
+        /* Only scroll on one axis at a time. */
+        if (swipeDir_ == 0) {
+            swipeDir_ = iAbs(e.x) > iAbs(e.y) ? 1 : 2;
+        }
+        if (swipeDir_ == 1) {
+            e.y = 0;
+        }
+        else if (swipeDir_ == 2) {
+            e.x = 0;
+        }
+        if (isEnded) {
+            swipeDir_ = 0;
+        }
+    }
+    else {
+        /* Disregard wheel acceleration applied by the OS. */
+        e.x = -event.scrollingDeltaX;
+        e.y = iSign(event.scrollingDeltaY);
+    }
+    // printf("#### [%d] dx:%d dy:%d phase:%ld inertia:%d end:%d\n", preventTapGlitch_, e.x, e.y, (long) event.momentumPhase,
+    //        isInertia, isEnded); fflush(stdout);
+    SDL_PushEvent((SDL_Event *) &e);
+#if 0
+        /* On macOS, we handle both trackpad and mouse events. We expect SDL to identify
+           which device is sending the event. */
+        if (ev.wheel.which == 0) {
+            /* Trackpad with precise scrolling w/inertia (points). */
+            setPerPixel_MouseWheelEvent(&ev.wheel, iTrue);
+            ev.wheel.x *= -d->window->base.pixelRatio;
+            ev.wheel.y *= d->window->base.pixelRatio;
+            /* Only scroll on one axis at a time. */
+            if (iAbs(ev.wheel.x) > iAbs(ev.wheel.y)) {
+                ev.wheel.y = 0;
+            }
+            else {
+                ev.wheel.x = 0;
+            }
+        }
+        else {
+            /* Disregard wheel acceleration applied by the OS. */
+            ev.wheel.x = -ev.wheel.x;
+            ev.wheel.y = iSign(ev.wheel.y);
+        }
+#endif
+    
+    return iTrue;        
+}
+
 void setupApplication_MacOS(void) {    
     NSApplication *app = [NSApplication sharedApplication];
     [app setActivationPolicy:NSApplicationActivationPolicyRegular];
@@ -423,6 +550,21 @@ void setupApplication_MacOS(void) {
     NSMenuItem *windowCloseItem = [windowMenu itemWithTitle:@"Close"];
     windowCloseItem.target = myDel;
     windowCloseItem.action = @selector(closeTab);
+    [NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskScrollWheel
+                                          handler:^NSEvent*(NSEvent *event){
+//                                            printf("event type: %lu\n", (unsigned long) event.type);
+//                                            fflush(stdout);
+//                                            if (event.type == NSEventTypeGesture) {
+//                                                trackSwipe_(event);
+//                                                printf("GESTURE phase:%lu\n", (unsigned long) event.phase);
+//fflush(stdout);
+//                                            }
+                                            if (event.type == NSEventTypeScrollWheel &&
+                                                processScrollWheelEvent_(event)) {
+                                                return nil; /* was eaten */                                                
+                                            }
+                                            return event;
+                                          }];
 }
 
 void hideTitleBar_MacOS(iWindow *window) {
@@ -439,6 +581,13 @@ void enableMenu_MacOS(const char *menuLabel, iBool enable) {
     [menuItem setEnabled:enable];
 }
 
+void enableMenuIndex_MacOS(int index, iBool enable) {
+    NSApplication *app = [NSApplication sharedApplication];
+    NSMenu *appMenu = [app mainMenu];
+    NSMenuItem *menuItem = [appMenu itemAtIndex:index];
+    [menuItem setEnabled:enable];        
+}
+
 void enableMenuItem_MacOS(const char *menuItemCommand, iBool enable) {
     NSApplication *app = [NSApplication sharedApplication];
     NSMenu *appMenu = [app mainMenu];
@@ -513,6 +662,47 @@ void enableMenuItemsByKey_MacOS(int key, int kmods, iBool enable) {
     delete_String(keyEquiv);
 }
 
+void enableMenuItemsOnHomeRow_MacOS(iBool enable) {
+    iStringSet *homeRowKeys = new_StringSet();
+    const char *keys[] = { /* Note: another array in documentwidget.c */
+        "f", "d", "s", "a",
+        "j", "k", "l",
+        "r", "e", "w", "q",
+        "u", "i", "o", "p",
+        "v", "c", "x", "z",
+        "m", "n",
+        "g", "h",
+        "b",
+        "t", "y"
+    };
+    iForIndices(i, keys) {
+        iString str;
+        initCStr_String(&str, keys[i]);
+        insert_StringSet(homeRowKeys, &str);
+        deinit_String(&str);
+    }
+    NSApplication *app = [NSApplication sharedApplication];
+    NSMenu *appMenu = [app mainMenu];
+    for (NSMenuItem *mainMenuItem in appMenu.itemArray) {
+        NSMenu *menu = mainMenuItem.submenu;
+        if (menu) {
+            for (NSMenuItem *menuItem in menu.itemArray) {
+                if (menuItem.keyEquivalentModifierMask == 0) {
+                    iString equiv;
+                    initCStr_String(&equiv, [menuItem.keyEquivalent
+                                                cStringUsingEncoding:NSUTF8StringEncoding]);
+                    if (contains_StringSet(homeRowKeys, &equiv)) {
+                        [menuItem setEnabled:enable];
+                        [menu setAutoenablesItems:NO];
+                    }
+                    deinit_String(&equiv);
+                }
+            }
+        }
+    }
+    iRelease(homeRowKeys);
+}
+
 static void setShortcut_NSMenuItem_(NSMenuItem *item, int key, int kmods) {
     NSEventModifierFlags modMask;
     iString *str = composeKeyEquivalent_(key, kmods, &modMask);
@@ -541,6 +731,29 @@ enum iColorId removeColorEscapes_String(iString *d) {
     return color;
 }
 
+static NSString *cleanString_(const iString *ansiEscapedText) {
+    iString mod;
+    initCopy_String(&mod, ansiEscapedText);
+    iRegExp *ansi = makeAnsiEscapePattern_Text();
+    replaceRegExp_String(&mod, ansi, "", NULL, NULL);
+    iRelease(ansi);
+    NSString *clean = [NSString stringWithUTF8String:cstr_String(&mod)];    
+    deinit_String(&mod);
+    return clean;
+}
+
+#if 0
+static NSAttributedString *makeAttributedString_(const iString *ansiEscapedText) {
+    iString mod;
+    initCopy_String(&mod, ansiEscapedText);
+    NSData *data = [NSData dataWithBytesNoCopy:data_Block(&mod.chars) length:size_String(&mod)];
+    NSAttributedString *as = [[NSAttributedString alloc] initWithHTML:data
+                                                   documentAttributes:nil];    
+    deinit_String(&mod);
+    return as;
+}
+#endif
+
 /* returns the selected item, if any */
 static NSMenuItem *makeMenuItems_(NSMenu *menu, MenuCommands *commands, const iMenuItem *items, size_t n) {
     NSMenuItem *selectedItem = nil;
@@ -557,7 +770,7 @@ static NSMenuItem *makeMenuItems_(NSMenu *menu, MenuCommands *commands, const iM
                 isChecked = iTrue;
                 label += 3;
             }
-            else if (startsWith_CStr(label, "///")) {
+            else if (startsWith_CStr(label, "///") || startsWith_CStr(label, "```")) {
                 isDisabled = iTrue;
                 label += 3;
             }
@@ -567,9 +780,13 @@ static NSMenuItem *makeMenuItems_(NSMenu *menu, MenuCommands *commands, const iM
             if (removeColorEscapes_String(&itemTitle) == uiTextCaution_ColorId) {
 //                prependCStr_String(&itemTitle, "\u26a0\ufe0f ");
             }
-            NSMenuItem *item = [menu addItemWithTitle:[NSString stringWithUTF8String:cstr_String(&itemTitle)]
-                                               action:(hasCommand ? @selector(postMenuItemCommand:) : nil)
-                                        keyEquivalent:@""];
+            NSMenuItem *item = [[NSMenuItem alloc] init];
+            /* Use attributed string to allow newlines. */
+            NSAttributedString *title = [[NSAttributedString alloc] initWithString:cleanString_(&itemTitle)];
+            item.attributedTitle = title;
+            [title release];
+            item.action = (hasCommand ? @selector(postMenuItemCommand:) : nil);
+            [menu addItem:item];
             deinit_String(&itemTitle);
             [item setTarget:commands];
             if (isChecked) {
diff --git a/src/main.c b/src/main.c
index ad69c6df..e18ab065 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,6 +67,7 @@ int main(int argc, char **argv) {
                           "ECDHE-RSA-AES128-GCM-SHA256:"
                           "DHE-RSA-AES256-GCM-SHA384");
     SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1");
+    SDL_EnableScreenSaver();
     SDL_SetHint(SDL_HINT_MAC_BACKGROUND_APP, "1");
     SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1");
 #if SDL_VERSION_ATLEAST(2, 0, 8)
@@ -82,9 +83,6 @@ int main(int argc, char **argv) {
         fprintf(stderr, "[SDL] init failed: %s\n", SDL_GetError());
         return -1;
     }
-    if (SDL_Init(SDL_INIT_AUDIO)) {
-        fprintf(stderr, "[SDL] audio init failed: %s\n", SDL_GetError());
-    }
     init_Updater();
     run_App(argc, argv);
     SDL_Quit();
diff --git a/src/media.c b/src/media.c
index a3f381ec..4940c13e 100644
--- a/src/media.c
+++ b/src/media.c
@@ -144,7 +144,7 @@ void makeTexture_GmImage(iGmImage *d) {
     }
     else {
         imgData = stbi_load_from_memory(
-            constData_Block(data), size_Block(data), &d->size.x, &d->size.y, NULL, 4);
+            constData_Block(data), (int) size_Block(data), &d->size.x, &d->size.y, NULL, 4);
         if (!imgData) {
             fprintf(stderr, "[media] image load failed: %s\n", stbi_failure_reason());
         }
@@ -629,6 +629,17 @@ void deinit_MediaRequest(iMediaRequest *d) {
     iRelease(d->req);
 }
 
+iMediaRequest *newReused_MediaRequest(iDocumentWidget *doc, unsigned int linkId,
+                                      iGmRequest *request) {
+    iMediaRequest *d = new_Object(&Class_MediaRequest);
+    d->doc = doc;
+    d->linkId = linkId;
+    d->req = request; /* takes ownership */
+    iConnect(GmRequest, d->req, updated, d, updated_MediaRequest_);
+    iConnect(GmRequest, d->req, finished, d, finished_MediaRequest_);
+    return d;
+}
+
 iDefineObjectConstructionArgs(MediaRequest,
                               (iDocumentWidget *doc, unsigned int linkId, const iString *url,
                                iBool enableFilters),
diff --git a/src/media.h b/src/media.h
index 3b329716..584c77eb 100644
--- a/src/media.h
+++ b/src/media.h
@@ -123,3 +123,6 @@ struct Impl_MediaRequest {
 
 iDeclareObjectConstructionArgs(MediaRequest, iDocumentWidget *doc, unsigned int linkId,
                                const iString *url, iBool enableFilters)
+    
+iMediaRequest * newReused_MediaRequest  (iDocumentWidget *doc, unsigned int linkId,
+                                         iGmRequest *request);
diff --git a/src/mimehooks.c b/src/mimehooks.c
index c097bd1f..eb379106 100644
--- a/src/mimehooks.c
+++ b/src/mimehooks.c
@@ -142,7 +142,8 @@ static iBlock *translateAtomXmlToGeminiFeed_(const iString *mime, const iBlock *
     appendCStr_String(&out, cstr_Lang("feeds.atom.translated"));
     appendCStr_String(&out, "\n\n");
     iRegExp *datePattern =
-        iClob(new_RegExp("^([0-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9])(T|\\s).*", caseSensitive_RegExpOption));
+        iClob(new_RegExp("^\\s*([0-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9])(T|\\s).*",
+                         caseSensitive_RegExpOption));
     iBeginCollect();
     iConstForEach(PtrArray, i, &feed->children) {
         iEndCollect();
diff --git a/src/periodic.c b/src/periodic.c
index ef3d8033..b4f51ed3 100644
--- a/src/periodic.c
+++ b/src/periodic.c
@@ -57,6 +57,25 @@ iDefineTypeConstructionArgs(PeriodicCommand, (iAny *ctx, const char *cmd), ctx,
 
 static const uint32_t postingInterval_Periodic_ = 500;
 
+static uint32_t postEvent_Periodic_(uint32_t interval, void *context) {
+    iUnused(context);
+    SDL_UserEvent ev = { .type      = SDL_USEREVENT,
+                         .timestamp = SDL_GetTicks(),
+                         .code      = periodic_UserEventCode };
+    SDL_PushEvent((SDL_Event *) &ev);
+    return interval;
+}
+
+static void startOrStopWakeupTimer_Periodic_(iPeriodic *d, iBool start) {
+    if (start && !d->wakeupTimer) {
+        d->wakeupTimer = SDL_AddTimer(postingInterval_Periodic_, postEvent_Periodic_, d);
+    }
+    else if (!start && d->wakeupTimer) {
+        SDL_RemoveTimer(d->wakeupTimer);
+        d->wakeupTimer = 0;
+    }
+}
+
 static void removePending_Periodic_(iPeriodic *d) {
     iForEach(PtrSet, i, &d->pendingRemoval) {
         size_t pos;
@@ -68,6 +87,9 @@ static void removePending_Periodic_(iPeriodic *d) {
         }
     }
     clear_PtrSet(&d->pendingRemoval);
+    if (isEmpty_SortedArray(&d->commands)) {
+        startOrStopWakeupTimer_Periodic_(d, iFalse);
+    }
 }
 
 static iBool isDispatching_;
@@ -109,9 +131,11 @@ void init_Periodic(iPeriodic *d) {
     init_SortedArray(&d->commands, sizeof(iPeriodicCommand), cmp_PeriodicCommand_);
     d->lastPostTime = 0;
     init_PtrSet(&d->pendingRemoval);
+    d->wakeupTimer = 0;
 }
 
 void deinit_Periodic(iPeriodic *d) {
+    startOrStopWakeupTimer_Periodic_(d, iFalse);
     deinit_PtrSet(&d->pendingRemoval);
     iForEach(Array, i, &d->commands.values) {
         deinit_PeriodicCommand(i.value);
@@ -121,6 +145,7 @@ void deinit_Periodic(iPeriodic *d) {
 }
 
 void add_Periodic(iPeriodic *d, iAny *context, const char *command) {
+    iAssert(isInstance_Object(context, &Class_Widget));
     lock_Mutex(d->mutex);
     size_t pos;
     iPeriodicCommand key = { .context = context };
@@ -133,6 +158,7 @@ void add_Periodic(iPeriodic *d, iAny *context, const char *command) {
         init_PeriodicCommand(&pc, context, command);
         insert_SortedArray(&d->commands, &pc);
     }
+    startOrStopWakeupTimer_Periodic_(d, iTrue);
     unlock_Mutex(d->mutex);
 }
 
diff --git a/src/periodic.h b/src/periodic.h
index a56310a8..f65a4299 100644
--- a/src/periodic.h
+++ b/src/periodic.h
@@ -35,6 +35,7 @@ struct Impl_Periodic {
     iSortedArray commands;
     uint32_t     lastPostTime;
     iPtrSet      pendingRemoval; /* contexts */
+    int          wakeupTimer; /* running while there are pending periodic commands */
 };
 
 void    init_Periodic   (iPeriodic *);
diff --git a/src/prefs.c b/src/prefs.c
index 10df9ade..6164ca25 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -23,6 +23,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "prefs.h"
 
 #include <the_Foundation/fileinfo.h>
+#include <assert.h>
+
+static_assert(offsetof(iPrefs, plainTextWrap) == offsetof(iPrefs, bools[plainTextWrap_PrefsBool]),
+              "memory layout mismatch (needs struct packing?)");
 
 void init_Prefs(iPrefs *d) {
     iForIndices(i, d->strings) {
@@ -40,8 +44,20 @@ void init_Prefs(iPrefs *d) {
     d->uiAnimations      = iTrue;
     d->uiScale           = 1.0f; /* default set elsewhere */
     d->zoomPercent       = 100;
+    d->navbarActions[0]  = back_ToolbarAction;
+    d->navbarActions[1]  = forward_ToolbarAction;
+    d->navbarActions[2]  = sidebar_ToolbarAction;
+    d->navbarActions[3]  = home_ToolbarAction;
+#if defined (iPlatformAndroidMobile)
+    /* Android has a system-wide back button so no need to have a duplicate. */
+    d->toolbarActions[0] = closeTab_ToolbarAction;
+#else
+    d->toolbarActions[0] = back_ToolbarAction;
+#endif
+    d->toolbarActions[1] = forward_ToolbarAction;
     d->sideIcon          = iTrue;
     d->hideToolbarOnScroll = iTrue;
+    d->blinkingCursor    = iTrue;
     d->pinSplit          = 1;
     d->time24h           = iTrue;
     d->returnKey         = default_ReturnKeyBehavior;
diff --git a/src/prefs.h b/src/prefs.h
index 2fbff9de..ea864f51 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -33,76 +33,150 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 iDeclareType(Prefs)
     
 enum iPrefsString {
+    /* General */
     uiLanguage_PrefsString,
     downloadDir_PrefsString,
     searchUrl_PrefsString,
+        
     /* Network */
     caFile_PrefsString,
     caPath_PrefsString,
     geminiProxy_PrefsString,
     gopherProxy_PrefsString,
     httpProxy_PrefsString,
+        
     /* Style */
     uiFont_PrefsString,
     headingFont_PrefsString,
     bodyFont_PrefsString,
     monospaceFont_PrefsString,
     monospaceDocumentFont_PrefsString,
+        
+    /* Meta */
     max_PrefsString
 };
 
-/* TODO: Refactor at least the boolean values into an array for easier manipulation.
-   Then they can be (de)serialized as a group. Need to use a systematic command naming
-   convention for notifications.  */
+/* Note: These match match the array/struct in Prefs. */
+enum iPrefsBool {
+    /* Window and User Interface */
+    useSystemTheme_PrefsBool,
+    customFrame_PrefsBool,
+    retainWindowSize_PrefsBool,
+    uiAnimations_PrefsBool,
+    hideToolbarOnScroll_PrefsBool,
+    
+    blinkingCursor_PrefsBool,
+    
+    /* Document presentation */
+    sideIcon_PrefsBool,
+    time24h_PrefsBool,
+    
+    /* Behavior */
+    hoverLink_PrefsBool,
+    smoothScrolling_PrefsBool,
+    loadImageInsteadOfScrolling_PrefsBool,
+    collapsePreOnLoad_PrefsBool,
+    openArchiveIndexPages_PrefsBool,
+    
+    addBookmarksToBottom_PrefsBool,
+    warnAboutMissingGlyphs_PrefsBool,
+    
+    /* Network */
+    decodeUserVisibleURLs_PrefsBool,
+    
+    /* Style */
+    monospaceGemini_PrefsBool,
+    monospaceGopher_PrefsBool,
+    boldLinkVisited_PrefsBool,
+    boldLinkDark_PrefsBool,    
+    boldLinkLight_PrefsBool,
+    
+    fontSmoothing_PrefsBool,
+    bigFirstParagraph_PrefsBool,
+    quoteIcon_PrefsBool,
+    centerShortDocs_PrefsBool,
+    plainTextWrap_PrefsBool,
+    
+    /* Meta */
+    max_PrefsBool
+};
+
+#define maxNavbarActions_Prefs  4
+
+/* TODO: Use a systematic command naming convention for notifications. */
+
 struct Impl_Prefs {
-    iString          strings[max_PrefsString];
-    /* UI state */
+    iString strings[max_PrefsString];
+    union {
+        iBool bools[max_PrefsBool];
+        /* For convenience, contents of the array are accessible also via these members. */
+        struct {
+            /* Window and User Interface */
+            iBool useSystemTheme;
+            iBool customFrame; /* when LAGRANGE_ENABLE_CUSTOM_FRAME is defined */
+            iBool retainWindowSize;
+            iBool uiAnimations;
+            iBool hideToolbarOnScroll;
+            
+            iBool blinkingCursor;
+            
+            /* Document presentation */
+            iBool sideIcon;
+            iBool time24h;
+            
+            /* Behavior */
+            iBool hoverLink;
+            iBool smoothScrolling;
+            iBool loadImageInsteadOfScrolling;
+            iBool collapsePreOnLoad;
+            iBool openArchiveIndexPages;
+            
+            iBool addBookmarksToBottom;
+            iBool warnAboutMissingGlyphs;
+            
+            /* Network */
+            iBool decodeUserVisibleURLs;
+            
+            /* Style */
+            iBool monospaceGemini;
+            iBool monospaceGopher;
+            iBool boldLinkVisited;
+            iBool boldLinkDark;            
+            iBool boldLinkLight;
+            
+            iBool fontSmoothing;
+            iBool bigFirstParagraph;
+            iBool quoteIcon;
+            iBool centerShortDocs;
+            iBool plainTextWrap;
+        };
+    };
+    /* UI state (belongs to state.lgr...) */
     int              dialogTab;
     int              langFrom;
     int              langTo;
-    /* Window */
-    iBool            useSystemTheme;
+    /* Colors */
     enum iColorTheme systemPreferredColorTheme[2]; /* dark, light */
     enum iColorTheme theme;    
     enum iColorAccent accent;
-    iBool            customFrame; /* when LAGRANGE_ENABLE_CUSTOM_FRAME is defined */
-    iBool            retainWindowSize;
-    iBool            uiAnimations;
+    /* Window and User Interface */
     float            uiScale;
+    enum iToolbarAction navbarActions[maxNavbarActions_Prefs];
+    enum iToolbarAction toolbarActions[2];
+    /* Document presentation */
     int              zoomPercent;
-    iBool            sideIcon;
-    iBool            hideToolbarOnScroll;
-    int              pinSplit; /* 0: no pinning, 1: left doc, 2: right doc */
-    iBool            time24h;
     /* Behavior */
+    int              pinSplit; /* 0: no pinning, 1: left doc, 2: right doc */
     int              returnKey;
-    iBool            hoverLink;
-    iBool            smoothScrolling;
     int              smoothScrollSpeed[max_ScrollType];
-    iBool            loadImageInsteadOfScrolling;
-    iBool            collapsePreOnLoad;
-    iBool            openArchiveIndexPages;
-    iBool            addBookmarksToBottom;
-    iBool            warnAboutMissingGlyphs;
     /* Network */
-    iBool            decodeUserVisibleURLs;
     int              maxCacheSize; /* MB */
     int              maxMemorySize; /* MB */
     /* Style */
     iStringSet *     disabledFontPacks;
-    iBool            fontSmoothing;
     int              gemtextAnsiEscapes;
-    iBool            monospaceGemini;
-    iBool            monospaceGopher;
-    iBool            boldLinkVisited;
-    iBool            boldLinkDark;
-    iBool            boldLinkLight;
     int              lineWidth;
     float            lineSpacing;
-    iBool            bigFirstParagraph;
-    iBool            quoteIcon;
-    iBool            centerShortDocs;
-    iBool            plainTextWrap;
     enum iImageStyle imageStyle;
     /* Colors */
     enum iGmDocumentTheme docThemeDark;
diff --git a/src/resources.c b/src/resources.c
index 03ca7cbb..ae85463a 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <SDL_rwops.h>
 
 static iArchive *archive_;
-    
+
 iBlock blobAbout_Resources;
 iBlock blobHelp_Resources;
 iBlock blobLagrange_Resources;
@@ -66,10 +66,18 @@ static struct {
     const char *archivePath;
 } entries_[] = {
     { &blobAbout_Resources, "about/about.gmi" },
-    { &blobHelp_Resources, "about/help.gmi" },
     { &blobLagrange_Resources, "about/lagrange.gmi" },
     { &blobLicense_Resources, "about/license.gmi" },
+#if defined (iPlatformAppleMobile)
+    { &blobHelp_Resources, "about/ios-help.gmi" },
+    { &blobVersion_Resources, "about/ios-version.gmi" },
+#elif defined (iPlatformAndroidMobile)
+    { &blobHelp_Resources, "about/android-help.gmi" },
+    { &blobVersion_Resources, "about/android-version.gmi" },
+#else
+    { &blobHelp_Resources, "about/help.gmi" },
     { &blobVersion_Resources, "about/version.gmi" },
+#endif
     { &blobArghelp_Resources, "arg-help.txt" },
     { &blobCs_Resources, "lang/cs.bin" },
     { &blobDe_Resources, "lang/de.bin" },
diff --git a/src/sitespec.c b/src/sitespec.c
index 6f4546f0..fe80ad13 100644
--- a/src/sitespec.c
+++ b/src/sitespec.c
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/file.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/stringhash.h>
+#include <the_Foundation/stringarray.h>
 #include <the_Foundation/toml.h>
 
 iDeclareClass(SiteParams)
@@ -35,6 +36,7 @@ struct Impl_SiteParams {
     uint16_t titanPort;
     iString  titanIdentity; /* fingerprint */
     int      dismissWarnings;
+    iStringArray usedIdentities; /* fingerprints; latest ones at the end */
     /* TODO: theme seed, style settings */
 };
 
@@ -42,12 +44,23 @@ void init_SiteParams(iSiteParams *d) {
     d->titanPort = 0; /* undefined */
     init_String(&d->titanIdentity);
     d->dismissWarnings = 0;
+    init_StringArray(&d->usedIdentities);
 }
 
 void deinit_SiteParams(iSiteParams *d) {
+    deinit_StringArray(&d->usedIdentities);
     deinit_String(&d->titanIdentity);
 }
 
+static size_t findUsedIdentity_SiteParams_(const iSiteParams *d, const iString *fingerprint) {
+    iConstForEach(StringArray, i, &d->usedIdentities) {
+        if (equal_String(i.value, fingerprint)) {
+            return index_StringArrayConstIterator(&i);
+        }
+    }
+    return iInvalidPos;
+}
+
 iDefineClass(SiteParams)
 iDefineObjectConstruction(SiteParams)
     
@@ -128,7 +141,13 @@ static void handleIniKeyValue_SiteSpec_(void *context, const iString *table, con
         set_String(&d->loadParams->titanIdentity, value->value.string);
     }
     else if (!cmp_String(key, "dismissWarnings") && value->type == int64_TomlType) {
-        d->loadParams->dismissWarnings = value->value.int64;
+        d->loadParams->dismissWarnings = (int) value->value.int64;
+    }
+    else if (!cmp_String(key, "usedIdentities") && value->type == string_TomlType) {
+        iRangecc seg = iNullRange;
+        while (nextSplit_Rangecc(range_String(value->value.string), " ", &seg)) {
+            pushBack_StringArray(&d->loadParams->usedIdentities, collectNewRange_String(seg));
+        }
     }
 }
 
@@ -151,6 +170,7 @@ static void save_SiteSpec_(iSiteSpec *d) {
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {
         iString *buf = new_String();
         iConstForEach(StringHash, i, &d->sites) {
+            iBeginCollect();
             const iBlock *     key    = &i.value->keyBlock;
             const iSiteParams *params = i.value->object;
             format_String(buf, "[%s]\n", cstr_Block(key));
@@ -164,8 +184,15 @@ static void save_SiteSpec_(iSiteSpec *d) {
             if (params->dismissWarnings) {
                 appendFormat_String(buf, "dismissWarnings = 0x%x\n", params->dismissWarnings);
             }
+            if (!isEmpty_StringArray(&params->usedIdentities)) {
+                appendFormat_String(
+                    buf,
+                    "usedIdentities = \"%s\"\n",
+                    cstrCollect_String(joinCStr_StringArray(&params->usedIdentities, " ")));
+            }
             appendCStr_String(buf, "\n");
             write_File(f, utf8_String(buf));
+            iEndCollect();
         }
         delete_String(buf);
     }
@@ -188,14 +215,19 @@ void deinit_SiteSpec(void) {
     deinit_String(&d->saveDir);
 }
 
-void setValue_SiteSpec(const iString *site, enum iSiteSpecKey key, int value) {
-    iSiteSpec *d = &siteSpec_;
+static iSiteParams *findParams_SiteSpec_(iSiteSpec *d, const iString *site) {
     const iString *hashKey = collect_String(lower_String(site));
     iSiteParams *params = value_StringHash(&d->sites, hashKey);
     if (!params) {
         params = new_SiteParams();
         insert_StringHash(&d->sites, hashKey, params);
     }
+    return params;
+}
+
+void setValue_SiteSpec(const iString *site, enum iSiteSpecKey key, int value) {
+    iSiteSpec *d = &siteSpec_;
+    iSiteParams *params = findParams_SiteSpec_(d, site);
     iBool needSave = iFalse;
     switch (key) {
         case titanPort_SiteSpecKey:
@@ -216,12 +248,7 @@ void setValue_SiteSpec(const iString *site, enum iSiteSpecKey key, int value) {
 
 void setValueString_SiteSpec(const iString *site, enum iSiteSpecKey key, const iString *value) {
     iSiteSpec *d = &siteSpec_;
-    const iString *hashKey = collect_String(lower_String(site));
-    iSiteParams *params = value_StringHash(&d->sites, hashKey);
-    if (!params) {
-        params = new_SiteParams();
-        insert_StringHash(&d->sites, hashKey, params);
-    }
+    iSiteParams *params = findParams_SiteSpec_(d, site);
     iBool needSave = iFalse;
     switch (key) {
         case titanIdentity_SiteSpecKey:
@@ -238,6 +265,44 @@ void setValueString_SiteSpec(const iString *site, enum iSiteSpecKey key, const i
     }
 }
 
+static void insertOrRemoveString_SiteSpec_(iSiteSpec *d, const iString *site, enum iSiteSpecKey key,
+                                           const iString *value, iBool doInsert) {
+    iSiteParams *params = findParams_SiteSpec_(d, site);
+    iBool needSave = iFalse;
+    switch (key) {
+        case usedIdentities_SiteSpecKey: {
+            const size_t index = findUsedIdentity_SiteParams_(params, value);
+            if (doInsert && index == iInvalidPos) {
+                pushBack_StringArray(&params->usedIdentities, value);
+                needSave = iTrue;
+            }
+            else if (!doInsert && index != iInvalidPos) {
+                remove_StringArray(&params->usedIdentities, index);
+                needSave = iTrue;
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    if (needSave) {
+        save_SiteSpec_(d);
+    }    
+}
+
+void insertString_SiteSpec(const iString *site, enum iSiteSpecKey key, const iString *value) {
+    insertOrRemoveString_SiteSpec_(&siteSpec_, site, key, value, iTrue);
+}
+
+void removeString_SiteSpec(const iString *site, enum iSiteSpecKey key, const iString *value) {
+    insertOrRemoveString_SiteSpec_(&siteSpec_, site, key, value, iFalse);
+}
+
+const iStringArray *strings_SiteSpec(const iString *site, enum iSiteSpecKey key) {
+    const iSiteParams *params = findParams_SiteSpec_(&siteSpec_, site);
+    return &params->usedIdentities;
+}
+
 int value_SiteSpec(const iString *site, enum iSiteSpecKey key) {
     iSiteSpec *d = &siteSpec_;
     const iSiteParams *params = constValue_StringHash(&d->sites, collect_String(lower_String(site)));
diff --git a/src/sitespec.h b/src/sitespec.h
index 5adaeb8c..11c40e3c 100644
--- a/src/sitespec.h
+++ b/src/sitespec.h
@@ -22,22 +22,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
-#include <the_Foundation/string.h>
+#include <the_Foundation/stringarray.h>
 
 iDeclareType(SiteSpec)
-    
+
 enum iSiteSpecKey {
-    titanPort_SiteSpecKey,
-    titanIdentity_SiteSpecKey,
-    dismissWarnings_SiteSpecKey,
+    titanPort_SiteSpecKey,       /* int */
+    titanIdentity_SiteSpecKey,   /* String */
+    dismissWarnings_SiteSpecKey, /* int */
+    usedIdentities_SiteSpecKey,  /* StringArray */
 };
-    
+
 void    init_SiteSpec       (const char *saveDir);
 void    deinit_SiteSpec     (void);
 
 /* changes saved immediately */
 void    setValue_SiteSpec       (const iString *site, enum iSiteSpecKey key, int value); 
 void    setValueString_SiteSpec (const iString *site, enum iSiteSpecKey key, const iString *value);
+void    insertString_SiteSpec   (const iString *site, enum iSiteSpecKey key, const iString *value);
+void    removeString_SiteSpec   (const iString *site, enum iSiteSpecKey key, const iString *value);
 
-int             value_SiteSpec          (const iString *site, enum iSiteSpecKey key);
-const iString * valueString_SiteSpec    (const iString *site, enum iSiteSpecKey key);
+int                 value_SiteSpec          (const iString *site, enum iSiteSpecKey key);
+const iString *     valueString_SiteSpec    (const iString *site, enum iSiteSpecKey key);
+const iStringArray *strings_SiteSpec        (const iString *site, enum iSiteSpecKey key);
diff --git a/src/ui/banner.c b/src/ui/banner.c
index 7ec189a4..11ae1574 100644
--- a/src/ui/banner.c
+++ b/src/ui/banner.c
@@ -76,7 +76,6 @@ static void updateHeight_Banner_(iBanner *d) {
     }
     const size_t numItems = size_Array(&d->items);
     if (numItems) {
-        const int innerPad = gap_UI;
         iConstForEach(Array, i, &d->items) {
             const iBannerItem *item = i.value;
             d->rect.size.y += item->height;
@@ -161,6 +160,13 @@ void setSite_Banner(iBanner *d, iRangecc site, iChar icon) {
 
 void add_Banner(iBanner *d, enum iBannerType type, enum iGmStatusCode code,
                 const iString *message, const iString *details) {
+    /* If there already is a matching item, don't add a second one. */
+    iConstForEach(Array, i, &d->items) {
+        const iBannerItem *item = i.value;
+        if (item->type == type && item->code == code) {
+            return;
+        }
+    }
     iBannerItem item;
     init_BannerItem(&item);
     item.type = type;
diff --git a/src/ui/bindingswidget.c b/src/ui/bindingswidget.c
index 4cf8df8e..13f9434e 100644
--- a/src/ui/bindingswidget.c
+++ b/src/ui/bindingswidget.c
@@ -143,12 +143,16 @@ static void setActiveItem_BindingsWidget_(iBindingsWidget *d, size_t pos) {
         item->isWaitingForEvent = iTrue;
         invalidateItem_ListWidget(d->list, d->activePos);
     }
-#if defined (iPlatformAppleDesktop)
+#if defined (iPlatformAppleDesktop) && defined (iHaveNativeContextMenus)
     /* Native menus must be disabled while grabbing keys so the shortcuts don't trigger. */
     const iBool enableNativeMenus = (d->activePos == iInvalidPos);
+    enableMenu_MacOS("${menu.title.file}", enableNativeMenus);
     enableMenu_MacOS("${menu.title.edit}", enableNativeMenus);
     enableMenu_MacOS("${menu.title.view}", enableNativeMenus);
+    enableMenu_MacOS("${menu.title.bookmarks}", enableNativeMenus);
     enableMenu_MacOS("${menu.title.identity}", enableNativeMenus);
+    enableMenuIndex_MacOS(6, enableNativeMenus);
+    enableMenuIndex_MacOS(7, enableNativeMenus);
 #endif
 }
 
diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c
index f4dfdefa..e4e461e0 100644
--- a/src/ui/certimportwidget.c
+++ b/src/ui/certimportwidget.c
@@ -145,10 +145,7 @@ void init_CertImportWidget(iCertImportWidget *d) {
     else {
         /* This should behave similar to sheets. */ 
         useSheetStyle_Widget(w);
-        addChildFlags_Widget(
-            w,
-            iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.certimport}", NULL)),
-            frameless_WidgetFlag);
+        addDialogTitle_Widget(w, "${heading.certimport}", NULL);
         d->info = addChildFlags_Widget(w, iClob(new_LabelWidget(infoText_, NULL)), frameless_WidgetFlag);
         addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
         d->crtLabel = new_LabelWidget("", NULL); {
diff --git a/src/ui/certlistwidget.c b/src/ui/certlistwidget.c
new file mode 100644
index 00000000..2a7562d8
--- /dev/null
+++ b/src/ui/certlistwidget.c
@@ -0,0 +1,490 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "certlistwidget.h"
+
+#include "documentwidget.h"
+#include "command.h"
+#include "labelwidget.h"
+#include "listwidget.h"
+#include "../gmcerts.h"
+#include "../app.h"
+
+#include <SDL_clipboard.h>
+
+iDeclareType(CertItem)
+typedef iListItemClass iCertItemClass;
+
+struct Impl_CertItem {
+    iListItem listItem;
+    uint32_t  id;
+    int       indent;
+    iChar     icon;
+    iBool     isBold;
+    iString   label;
+    iString   meta;
+//    iString   url;
+};
+
+void init_CertItem(iCertItem *d) {
+    init_ListItem(&d->listItem);
+    d->id     = 0;
+    d->indent = 0;
+    d->icon   = 0;
+    d->isBold = iFalse;
+    init_String(&d->label);
+    init_String(&d->meta);
+//    init_String(&d->url);
+}
+
+void deinit_CertItem(iCertItem *d) {
+//    deinit_String(&d->url);
+    deinit_String(&d->meta);
+    deinit_String(&d->label);
+}
+
+static void draw_CertItem_(const iCertItem *d, iPaint *p, iRect itemRect, const iListWidget *list);
+
+iBeginDefineSubclass(CertItem, ListItem)
+    .draw = (iAny *) draw_CertItem_,
+iEndDefineSubclass(CertItem)
+
+iDefineObjectConstruction(CertItem)
+
+/*----------------------------------------------------------------------------------------------*/
+
+struct Impl_CertListWidget {
+    iListWidget  list;
+    int          itemFonts[2];
+    iWidget     *menu;         /* context menu for an item */
+    iCertItem   *contextItem;  /* list item accessed in the context menu */
+    size_t       contextIndex; /* index of list item accessed in the context menu */
+};
+
+iDefineObjectConstruction(CertListWidget)
+
+static iGmIdentity *menuIdentity_CertListWidget_(const iCertListWidget *d) {
+    if (d->contextItem) {
+        return identity_GmCerts(certs_App(), d->contextItem->id);
+    }
+    return NULL;
+}
+
+static void updateContextMenu_CertListWidget_(iCertListWidget *d) {
+    iArray *items = collectNew_Array(sizeof(iMenuItem));
+    const iString *docUrl = url_DocumentWidget(document_App());
+    size_t firstIndex = 0;
+    if (deviceType_App() != desktop_AppDeviceType && !isEmpty_String(docUrl)) {
+        pushBack_Array(items, &(iMenuItem){ format_CStr("```%s", cstr_String(docUrl)) });
+        firstIndex = 1;
+    }
+    const iMenuItem ctxItems[] = {
+        { person_Icon " ${ident.use}", 0, 0, "ident.use arg:1" },
+        { close_Icon " ${ident.stopuse}", 0, 0, "ident.use arg:0" },
+        { close_Icon " ${ident.stopuse.all}", 0, 0, "ident.use arg:0 clear:1" },
+        { "---", 0, 0, NULL },
+        { edit_Icon " ${menu.edit.notes}", 0, 0, "ident.edit" },
+        { "${ident.fingerprint}", 0, 0, "ident.fingerprint" },
+#if defined (iPlatformAppleDesktop)
+        { magnifyingGlass_Icon " ${menu.reveal.macos}", 0, 0, "ident.reveal" },
+#endif
+#if defined (iPlatformLinux)
+        { magnifyingGlass_Icon " ${menu.reveal.filemgr}", 0, 0, "ident.reveal" },
+#endif
+        { export_Icon " ${ident.export}", 0, 0, "ident.export" },
+        { "---", 0, 0, NULL },
+        { delete_Icon " " uiTextCaution_ColorEscape "${ident.delete}", 0, 0, "ident.delete confirm:1" },
+    };
+    pushBackN_Array(items, ctxItems, iElemCount(ctxItems));
+    /* Used URLs. */
+    const iGmIdentity *ident = menuIdentity_CertListWidget_(d);
+    if (ident) {
+        size_t insertPos = firstIndex + 3;
+        if (!isEmpty_StringSet(ident->useUrls)) {
+            insert_Array(items, insertPos++, &(iMenuItem){ "---", 0, 0, NULL });
+        }
+        iBool usedOnCurrentPage = iFalse;
+        iConstForEach(StringSet, i, ident->useUrls) {            
+            const iString *url = i.value;
+            usedOnCurrentPage |= startsWithCase_String(docUrl, cstr_String(url));
+            iRangecc urlStr = range_String(url);
+            if (startsWith_Rangecc(urlStr, "gemini://")) {
+                urlStr.start += 9; /* omit the default scheme */
+            }
+            insert_Array(items,
+                         insertPos++,
+                         &(iMenuItem){ format_CStr(globe_Icon " %s", cstr_Rangecc(urlStr)),
+                                       0,
+                                       0,
+                                       format_CStr("!open url:%s", cstr_String(url)) });
+        }
+        if (!usedOnCurrentPage) {
+            remove_Array(items, firstIndex + 1);
+        }
+        else {
+            remove_Array(items, firstIndex);
+        }
+    }
+    destroy_Widget(d->menu);    
+    d->menu = makeMenu_Widget(as_Widget(d), data_Array(items), size_Array(items));    
+}
+
+static void itemClicked_CertListWidget_(iCertListWidget *d, iCertItem *item, size_t itemIndex) {
+    iWidget *w = as_Widget(d);
+    setFocus_Widget(NULL);
+    d->contextItem  = item;
+    if (d->contextIndex != iInvalidPos) {
+        invalidateItem_ListWidget(&d->list, d->contextIndex);
+    }
+    d->contextIndex = itemIndex;
+    if (itemIndex < numItems_ListWidget(&d->list)) {
+        updateContextMenu_CertListWidget_(d);
+        arrange_Widget(d->menu);
+        openMenu_Widget(d->menu,
+                        bounds_Widget(w).pos.x < mid_Rect(rect_Root(w->root)).x
+                            ? topRight_Rect(itemRect_ListWidget(&d->list, itemIndex))
+                            : addX_I2(topLeft_Rect(itemRect_ListWidget(&d->list, itemIndex)),
+                                      -width_Widget(d->menu)));
+    }
+}
+
+static iBool processEvent_CertListWidget_(iCertListWidget *d, const SDL_Event *ev) {
+    iWidget *w = as_Widget(d);
+    /* Handle commands. */
+    if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
+        const char *cmd = command_UserEvent(ev);
+        if (equal_Command(cmd, "idents.changed")) {
+            updateItems_CertListWidget(d);
+        }
+        else if (isCommand_Widget(w, ev, "list.clicked")) {
+            itemClicked_CertListWidget_(
+                d, pointerLabel_Command(cmd, "item"), argU32Label_Command(cmd, "arg"));
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.use")) {
+            iGmIdentity *ident = menuIdentity_CertListWidget_(d);            
+            const iString *tabUrl = urlQueryStripped_String(url_DocumentWidget(document_App()));
+            if (ident) {
+                if (argLabel_Command(cmd, "clear")) {
+                    clearUse_GmIdentity(ident);
+                }
+                else if (arg_Command(cmd)) {
+                    signIn_GmCerts(certs_App(), ident, tabUrl);
+                    postCommand_App("navigate.reload");
+                }
+                else {
+                    signOut_GmCerts(certs_App(), tabUrl);
+                    postCommand_App("navigate.reload");
+                }
+                saveIdentities_GmCerts(certs_App());
+                updateItems_CertListWidget(d);
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.edit")) {
+            const iGmIdentity *ident = menuIdentity_CertListWidget_(d);
+            if (ident) {
+                makeValueInput_Widget(get_Root()->widget,
+                                      &ident->notes,
+                                      uiHeading_ColorEscape "${heading.ident.notes}",
+                                      format_CStr(cstr_Lang("dlg.ident.notes"), cstr_String(name_GmIdentity(ident))),
+                                      uiTextAction_ColorEscape "${dlg.default}",
+                                      format_CStr("!ident.setnotes ident:%p ptr:%p", ident, d));
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.fingerprint")) {
+            const iGmIdentity *ident = menuIdentity_CertListWidget_(d);
+            if (ident) {
+                const iString *fps = collect_String(
+                    hexEncode_Block(collect_Block(fingerprint_TlsCertificate(ident->cert))));
+                SDL_SetClipboardText(cstr_String(fps));
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.export")) {
+            const iGmIdentity *ident = menuIdentity_CertListWidget_(d);
+            if (ident) {
+                iString *pem = collect_String(pem_TlsCertificate(ident->cert));
+                append_String(pem, collect_String(privateKeyPem_TlsCertificate(ident->cert)));
+                iDocumentWidget *expTab = newTab_App(NULL, iTrue);
+                setUrlAndSource_DocumentWidget(
+                    expTab,
+                    collectNewFormat_String("file:%s.pem", cstr_String(name_GmIdentity(ident))),
+                    collectNewCStr_String("text/plain"),
+                    utf8_String(pem));
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.setnotes")) {
+            iGmIdentity *ident = pointerLabel_Command(cmd, "ident");
+            if (ident) {
+                setCStr_String(&ident->notes, suffixPtr_Command(cmd, "value"));
+                updateItems_CertListWidget(d);
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.pickicon")) {
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.reveal")) {
+            const iGmIdentity *ident = menuIdentity_CertListWidget_(d);
+            if (ident) {
+                const iString *crtPath = certificatePath_GmCerts(certs_App(), ident);
+                if (crtPath) {
+                    postCommandf_App("reveal path:%s", cstr_String(crtPath));
+                }
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.delete")) {
+            iCertItem *item = d->contextItem;
+            if (argLabel_Command(cmd, "confirm")) {
+                makeQuestion_Widget(
+                    uiTextCaution_ColorEscape "${heading.ident.delete}",
+                    format_CStr(cstr_Lang("dlg.confirm.ident.delete"),
+                                uiTextAction_ColorEscape,
+                                cstr_String(&item->label),
+                                uiText_ColorEscape),
+                    (iMenuItem[]){ { "${cancel}", 0, 0, NULL },
+                                   { uiTextCaution_ColorEscape "${dlg.ident.delete}",
+                                     0,
+                                     0,
+                                     format_CStr("!ident.delete confirm:0 ptr:%p", d) } },
+                    2);
+                return iTrue;
+            }
+            deleteIdentity_GmCerts(certs_App(), menuIdentity_CertListWidget_(d));
+            postCommand_App("idents.changed");
+            return iTrue;
+        }
+    }
+    if (ev->type == SDL_MOUSEMOTION && !isVisible_Widget(d->menu)) {
+        const iInt2 mouse = init_I2(ev->motion.x, ev->motion.y);
+        /* Update cursor. */
+        if (contains_Widget(w, mouse)) {
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
+        }
+        else if (d->contextIndex != iInvalidPos) {
+            invalidateItem_ListWidget(&d->list, d->contextIndex);
+            d->contextIndex = iInvalidPos;
+        }
+    }
+    /* Update context menu items. */
+    if (ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT) {
+        d->contextItem = NULL;
+        if (!isVisible_Widget(d->menu)) {
+            updateMouseHover_ListWidget(&d->list);
+        }
+        if (constHoverItem_ListWidget(&d->list) || isVisible_Widget(d->menu)) {
+            d->contextItem = hoverItem_ListWidget(&d->list);
+            /* Context is drawn in hover state. */
+            if (d->contextIndex != iInvalidPos) {
+                invalidateItem_ListWidget(&d->list, d->contextIndex);
+            }
+            d->contextIndex = hoverItemIndex_ListWidget(&d->list);
+            updateContextMenu_CertListWidget_(d);                
+            /* TODO: Some callback-based mechanism would be nice for updating menus right
+               before they open? At least move these to `updateContextMenu_ */
+            const iGmIdentity *ident  = constHoverIdentity_CertListWidget(d);
+            const iString *    docUrl = url_DocumentWidget(document_App());
+            iForEach(ObjectList, i, children_Widget(d->menu)) {
+                if (isInstance_Object(i.object, &Class_LabelWidget)) {
+                    iLabelWidget *menuItem = i.object;
+                    const char *  cmdItem  = cstr_String(command_LabelWidget(menuItem));
+                    if (equal_Command(cmdItem, "ident.use")) {
+                        const iBool cmdUse   = arg_Command(cmdItem) != 0;
+                        const iBool cmdClear = argLabel_Command(cmdItem, "clear") != 0;
+                        setFlags_Widget(
+                            as_Widget(menuItem),
+                            disabled_WidgetFlag,
+                            (cmdClear && !isUsed_GmIdentity(ident)) ||
+                                (!cmdClear && cmdUse && isUsedOn_GmIdentity(ident, docUrl)) ||
+                                (!cmdClear && !cmdUse && !isUsedOn_GmIdentity(ident, docUrl)));
+                    }
+                }
+            }
+        }
+        if (hoverItem_ListWidget(&d->list) || isVisible_Widget(d->menu)) {
+            processContextMenuEvent_Widget(d->menu, ev, {});
+        }
+    }
+    return ((iWidgetClass *) class_Widget(w)->super)->processEvent(w, ev);
+}
+
+static void draw_CertListWidget_(const iCertListWidget *d) {
+    const iWidget *w = constAs_Widget(d);
+    ((iWidgetClass *) class_Widget(w)->super)->draw(w);
+}
+
+static void draw_CertItem_(const iCertItem *d, iPaint *p, iRect itemRect,
+                              const iListWidget *list) {
+    const iCertListWidget *certList = (const iCertListWidget *) list;
+    const iBool isMenuVisible = isVisible_Widget(certList->menu);
+    const iBool isDragging   = constDragItem_ListWidget(list) == d;
+    const iBool isPressing   = isMouseDown_ListWidget(list) && !isDragging;
+    const iBool isHover      =
+            (!isMenuVisible &&
+            isHover_Widget(constAs_Widget(list)) &&
+            constHoverItem_ListWidget(list) == d) ||
+            (isMenuVisible && certList->contextItem == d) ||
+            isDragging;
+    const int itemHeight     = height_Rect(itemRect);
+    const int iconColor      = isHover ? (isPressing ? uiTextPressed_ColorId : uiIconHover_ColorId)
+                                       : uiIcon_ColorId;
+    const int altIconColor   = isPressing ? uiTextPressed_ColorId : uiTextCaution_ColorId;
+    const int font = certList->itemFonts[d->isBold ? 1 : 0];
+    int bg         = uiBackgroundSidebar_ColorId;
+    if (isHover) {
+        bg = isPressing ? uiBackgroundPressed_ColorId
+                        : uiBackgroundFramelessHover_ColorId;
+        fillRect_Paint(p, itemRect, bg);
+    }
+    else if (d->listItem.isSelected) {
+        bg = uiBackgroundUnfocusedSelection_ColorId;
+        fillRect_Paint(p, itemRect, bg);
+    }
+//    iInt2 pos = itemRect.pos; 
+    const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
+                           : uiTextStrong_ColorId;
+    const iBool isUsedOnDomain = (d->indent != 0);
+    iString icon;
+    initUnicodeN_String(&icon, &d->icon, 1);
+    iInt2 cPos = topLeft_Rect(itemRect);
+    const int indent = 1.4f * lineHeight_Text(font);
+    addv_I2(&cPos,
+            init_I2(3 * gap_UI,
+                    (itemHeight - lineHeight_Text(uiLabel_FontId) * 2 - lineHeight_Text(font)) /
+                        2));
+    const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
+                                                                 : uiTextFramelessHover_ColorId)
+                               : uiTextDim_ColorId;
+    if (!d->listItem.isSelected && !isUsedOnDomain) {
+        drawOutline_Text(font, cPos, metaFg, none_ColorId, range_String(&icon));
+    }
+    drawRange_Text(font,
+                   cPos,
+                   d->listItem.isSelected ? iconColor
+                   : isUsedOnDomain       ? altIconColor
+                                          : uiBackgroundSidebar_ColorId,
+                   range_String(&icon));
+    deinit_String(&icon);
+    drawRange_Text(d->listItem.isSelected ? certList->itemFonts[1] : font,
+                   add_I2(cPos, init_I2(indent, 0)),
+                   fg,
+                   range_String(&d->label));
+    drawRange_Text(uiLabel_FontId,
+                   add_I2(cPos, init_I2(indent, lineHeight_Text(font))),
+                   metaFg,
+                   range_String(&d->meta));
+}
+
+void init_CertListWidget(iCertListWidget *d) {
+    iWidget *w = as_Widget(d);
+    init_ListWidget(&d->list);
+    setId_Widget(w, "certlist");
+    setBackgroundColor_Widget(w, none_ColorId);
+    d->itemFonts[0] = uiContent_FontId;
+    d->itemFonts[1] = uiContentBold_FontId;
+#if defined (iPlatformMobile)
+    if (deviceType_App() == phone_AppDeviceType) {
+        d->itemFonts[0] = uiLabelBig_FontId;
+        d->itemFonts[1] = uiLabelBigBold_FontId;
+    }
+#endif
+    updateItemHeight_CertListWidget(d);
+    d->menu = NULL;
+    d->contextItem = NULL;
+    d->contextIndex = iInvalidPos;
+}
+
+void updateItemHeight_CertListWidget(iCertListWidget *d) {
+    setItemHeight_ListWidget(&d->list, 3.5f * lineHeight_Text(d->itemFonts[0]));
+}
+
+iBool updateItems_CertListWidget(iCertListWidget *d) {
+    clear_ListWidget(&d->list);
+    destroy_Widget(d->menu);
+    d->menu       = NULL;
+    const iString *tabUrl = url_DocumentWidget(document_App());
+    const iRangecc tabHost = urlHost_String(tabUrl);
+    iBool haveItems = iFalse;
+    iConstForEach(PtrArray, i, identities_GmCerts(certs_App())) {
+        const iGmIdentity *ident = i.ptr;
+        iCertItem *item = new_CertItem();
+        item->id = (uint32_t) index_PtrArrayConstIterator(&i);
+        item->icon = 0x1f464; /* person */
+        set_String(&item->label, name_GmIdentity(ident));
+        iDate until;
+        validUntil_TlsCertificate(ident->cert, &until);
+        const iBool isActive = isUsedOn_GmIdentity(ident, tabUrl);
+        format_String(&item->meta,
+                      "%s",
+                      isActive ? cstr_Lang("ident.using")
+                      : isUsed_GmIdentity(ident)
+                          ? formatCStrs_Lang("ident.usedonurls.n", size_StringSet(ident->useUrls))
+                          : cstr_Lang("ident.notused"));
+        const char *expiry =
+            ident->flags & temporary_GmIdentityFlag
+                ? cstr_Lang("ident.temporary")
+                : cstrCollect_String(format_Date(&until, cstr_Lang("ident.expiry")));
+        if (isEmpty_String(&ident->notes)) {
+            appendFormat_String(&item->meta, "\n%s", expiry);
+        }
+        else {
+            appendFormat_String(&item->meta,
+                                " \u2014 %s\n%s%s",
+                                expiry,
+                                escape_Color(uiHeading_ColorId),
+                                cstr_String(&ident->notes));
+        }
+        item->listItem.isSelected = isActive;
+        if (!isActive && isUsedOnDomain_GmIdentity(ident, tabHost)) {
+            item->indent = 1; /* will be highlighted */
+        }
+        addItem_ListWidget(&d->list, item);
+        haveItems = iTrue;
+        iRelease(item);
+    }
+    return haveItems;
+}
+
+void deinit_CertListWidget(iCertListWidget *d) {
+    iUnused(d);
+}
+
+const iGmIdentity *constHoverIdentity_CertListWidget(const iCertListWidget *d) {
+    const iCertItem *hoverItem = constHoverItem_ListWidget(&d->list);
+    if (hoverItem) {
+        return identity_GmCerts(certs_App(), hoverItem->id);
+    }
+    return NULL;
+}
+
+iGmIdentity *hoverIdentity_CertListWidget(const iCertListWidget *d) {
+    return iConstCast(iGmIdentity *, constHoverIdentity_CertListWidget(d));
+}
+
+iBeginDefineSubclass(CertListWidget, ListWidget)
+    .processEvent = (iAny *) processEvent_CertListWidget_,
+    .draw         = (iAny *) draw_CertListWidget_,
+iEndDefineSubclass(CertListWidget)
diff --git a/src/ui/certlistwidget.h b/src/ui/certlistwidget.h
new file mode 100644
index 00000000..2e5f6247
--- /dev/null
+++ b/src/ui/certlistwidget.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include "listwidget.h"
+
+iDeclareType(CertListWidget)
+
+typedef iListWidgetClass iCertListWidgetClass;
+extern iCertListWidgetClass Class_CertListWidget;
+
+iDeclareObjectConstruction(CertListWidget)
+
+iDeclareType(GmIdentity)
+
+const iGmIdentity * constHoverIdentity_CertListWidget(const iCertListWidget *);
+iGmIdentity *       hoverIdentity_CertListWidget     (const iCertListWidget *);
+
+iBool   updateItems_CertListWidget      (iCertListWidget *); /* returns False is empty */
+void    updateItemHeight_CertListWidget (iCertListWidget *);
diff --git a/src/ui/color.c b/src/ui/color.c
index 3ea98d8c..3c2f0339 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -90,8 +90,8 @@ void setThemePalette_Color(enum iColorTheme theme) {
     const int accentLo    = (prefs->accent == cyan_ColorAccent ? teal_ColorId : brown_ColorId);
     const int altAccentHi = (prefs->accent == cyan_ColorAccent ? orange_ColorId : cyan_ColorId);
     const int altAccentLo = (prefs->accent == cyan_ColorAccent ? brown_ColorId : teal_ColorId);
-    const iColor accentMid    = mix_Color(get_Color(accentHi), get_Color(accentLo), 0.5f);
-    const iColor altAccentMid = mix_Color(get_Color(altAccentHi), get_Color(altAccentLo), 0.5f);
+    //const iColor accentMid    = mix_Color(get_Color(accentHi), get_Color(accentLo), 0.5f);
+    //const iColor altAccentMid = mix_Color(get_Color(altAccentHi), get_Color(altAccentLo), 0.5f);
     switch (theme) {
         case pureBlack_ColorTheme: {
             copy_(uiBackground_ColorId, black_ColorId);
@@ -832,7 +832,7 @@ void ansiColors_Color(iRangecc escapeSequence, int fgDefault, int bgDefault,
                     int rgb[3] = { 0, 0, 0 };
                     iForIndices(i, rgb) {
                         if (ch >= escapeSequence.end) break;
-                        rgb[i] = strtoul(ch + 1, &endPtr, 10);
+                        rgb[i] = (int) strtoul(ch + 1, &endPtr, 10);
                         ch = endPtr;
                     }
                     dst->r = iClamp(rgb[0], 0, 255);
diff --git a/src/ui/color.h b/src/ui/color.h
index 0b3f8bed..24f9e713 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -136,7 +136,7 @@ enum iColorId {
     tmBackgroundAltText_ColorId,     /* derived from other theme colors */
     tmFrameAltText_ColorId,          /* derived from other theme colors */
     tmBackgroundOpenLink_ColorId,    /* derived from other theme colors */
-    tmFrameOpenLink_ColorId,         /* derived from other theme colors */
+    tmLinkFeedEntryDate_ColorId,     /* derived from other theme colors */
     tmLinkCustomIconVisited_ColorId, /* derived from other theme colors */
     tmBadLink_ColorId,
 
diff --git a/src/ui/command.c b/src/ui/command.c
index 3ae0f0c9..a4868ca9 100644
--- a/src/ui/command.c
+++ b/src/ui/command.c
@@ -26,6 +26,34 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/string.h>
 #include <ctype.h>
 
+iDeclareType(Token)
+
+#define maxLen_Token 64
+    
+struct Impl_Token {
+    char buf[64];
+    size_t size;
+};
+
+static void init_Token(iToken *d, const char *label) {
+    const size_t len = strlen(label);
+    iAssert(len < sizeof(d->buf) - 3);
+    d->buf[0] = ' ';
+    memcpy(d->buf + 1, label, len);
+    d->buf[1 + len] = ':';
+    d->buf[1 + len + 1] = 0;
+    d->size = len + 2;
+}
+
+static iRangecc find_Token(const iToken *d, const char *cmd) {
+    iRangecc range = iNullRange;
+    range.start = strstr(cmd, d->buf);
+    if (range.start) {
+        range.end = range.start + d->size;
+    }
+    return range;
+}
+
 iBool equal_Command(const char *cmdWithArgs, const char *cmd) {
     if (strchr(cmdWithArgs, ':')) {
         return startsWith_CStr(cmdWithArgs, cmd) && cmdWithArgs[strlen(cmd)] == ' ';
@@ -33,15 +61,12 @@ iBool equal_Command(const char *cmdWithArgs, const char *cmd) {
     return equal_CStr(cmdWithArgs, cmd);
 }
 
-static const iString *tokenString_(const char *label) {
-    return collectNewFormat_String(" %s:", label);
-}
-
 int argLabel_Command(const char *cmd, const char *label) {
-    const iString *tok = tokenString_(label);
-    const char *ptr = strstr(cmd, cstr_String(tok));
-    if (ptr) {
-        return atoi(ptr + size_String(tok));
+    iToken tok;
+    init_Token(&tok, label);
+    iRangecc ptr = find_Token(&tok, cmd);
+    if (ptr.start) {
+        return atoi(ptr.end);
     }
     return 0;
 }
@@ -51,19 +76,21 @@ int arg_Command(const char *cmd) {
 }
 
 uint32_t argU32Label_Command(const char *cmd, const char *label) {
-    const iString *tok = tokenString_(label);
-    const char *ptr = strstr(cmd, cstr_String(tok));
-    if (ptr) {
-        return strtoul(ptr + size_String(tok), NULL, 10);
+    iToken tok;
+    init_Token(&tok, label);
+    const iRangecc ptr = find_Token(&tok, cmd);    
+    if (ptr.start) {
+        return (uint32_t) strtoul(ptr.end, NULL, 10);
     }
     return 0;
 }
 
 float argfLabel_Command(const char *cmd, const char *label) {
-    const iString *tok = tokenString_(label);
-    const char *ptr = strstr(cmd, cstr_String(tok));
-    if (ptr) {
-        return strtof(ptr + size_String(tok), NULL);
+    iToken tok;
+    init_Token(&tok, label);
+    const iRangecc ptr = find_Token(&tok, cmd);    
+    if (ptr.start) {
+        return strtof(ptr.end, NULL);
     }
     return 0.0f;
 }
@@ -77,11 +104,12 @@ float argf_Command(const char *cmd) {
 }
 
 void *pointerLabel_Command(const char *cmd, const char *label) {
-    const iString *tok = tokenString_(label);
-    const char *ptr = strstr(cmd, cstr_String(tok));
-    if (ptr) {
+    iToken tok;
+    init_Token(&tok, label);
+    const iRangecc ptr = find_Token(&tok, cmd);        
+    if (ptr.start) {
         void *val = NULL;
-        sscanf(ptr + size_String(tok), "%p", &val);
+        sscanf(ptr.end, "%p", &val);
         return val;
     }
     return NULL;
@@ -92,10 +120,11 @@ void *pointer_Command(const char *cmd) {
 }
 
 const char *suffixPtr_Command(const char *cmd, const char *label) {
-    const iString *tok = tokenString_(label);
-    const char *ptr = strstr(cmd, cstr_String(tok));
-    if (ptr) {
-        return ptr + size_String(tok);
+    iToken tok;
+    init_Token(&tok, label);
+    const iRangecc ptr = find_Token(&tok, cmd);        
+    if (ptr.start) {
+        return ptr.end;
     }
     return NULL;
 }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 46af5fcd..fdb55232 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -20,8 +20,8 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
-/* TODO: This file is a little (!) too large. DocumentWidget could be split into
-   a couple of smaller objects. One for rendering the document, for instance. */
+/* TODO: Move DocumentView into a source file of its own. Consider cleaning up the network
+   request handling. */
 
 #include "documentwidget.h"
 
@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "inputwidget.h"
 #include "keys.h"
 #include "labelwidget.h"
+#include "linkinfo.h"
 #include "media.h"
 #include "paint.h"
 #include "periodic.h"
@@ -55,6 +56,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "visbuf.h"
 #include "visited.h"
 
+#if defined (iPlatformAppleDesktop)
+#   include "macos.h"
+#endif
 #if defined (iPlatformAppleMobile)
 #   include "ios.h"
 #endif
@@ -161,10 +165,10 @@ enum iDrawBufsFlag {
 };
 
 struct Impl_DrawBufs {
-    int            flags;
-    SDL_Texture *  sideIconBuf;
-    iTextBuf *     timestampBuf;
-    uint32_t       lastRenderTime;
+    int          flags;
+    SDL_Texture *sideIconBuf;
+    iTextBuf    *timestampBuf;
+    uint32_t     lastRenderTime;
 };
 
 static void init_DrawBufs(iDrawBufs *d) {
@@ -198,16 +202,6 @@ static void visBufInvalidated_(iVisBuf *d, size_t index) {
 
 /*----------------------------------------------------------------------------------------------*/
 
-static void animate_DocumentWidget_             (void *ticker);
-static void animateMedia_DocumentWidget_        (iDocumentWidget *d);
-static void updateSideIconBuf_DocumentWidget_   (const iDocumentWidget *d);
-static void prerender_DocumentWidget_           (iAny *);
-static void scrollBegan_DocumentWidget_         (iAnyObject *, int, uint32_t);
-
-static const int smoothDuration_DocumentWidget_(enum iScrollType type) {
-    return 600 /* milliseconds */ * scrollSpeedFactor_Prefs(prefs_App(), type);
-}
-
 enum iRequestState {
     blank_RequestState,
     fetching_RequestState,
@@ -229,8 +223,14 @@ enum iDocumentWidgetFlag {
     movingSelectMarkEnd_DocumentWidgetFlag   = iBit(11),
     otherRootByDefault_DocumentWidgetFlag    = iBit(12), /* links open to other root by default */
     urlChanged_DocumentWidgetFlag            = iBit(13),
-    openedFromSidebar_DocumentWidgetFlag     = iBit(14),
-    drawDownloadCounter_DocumentWidgetFlag   = iBit(15),
+    drawDownloadCounter_DocumentWidgetFlag   = iBit(14),
+    fromCache_DocumentWidgetFlag             = iBit(15), /* don't write anything to cache */
+    animationPlaceholder_DocumentWidgetFlag  = iBit(16), /* avoid slow operations */
+    invalidationPending_DocumentWidgetFlag   = iBit(17), /* invalidate as soon as convenient */
+    leftWheelSwipe_DocumentWidgetFlag        = iBit(18), /* swipe state flags are used on desktop */
+    rightWheelSwipe_DocumentWidgetFlag       = iBit(19),
+    eitherWheelSwipe_DocumentWidgetFlag      = leftWheelSwipe_DocumentWidgetFlag |
+                                               rightWheelSwipe_DocumentWidgetFlag,
 };
 
 enum iDocumentLinkOrdinalMode {
@@ -238,10 +238,44 @@ enum iDocumentLinkOrdinalMode {
     homeRow_DocumentLinkOrdinalMode,
 };
 
+enum iWheelSwipeState {
+    none_WheelSwipeState,
+    direct_WheelSwipeState,
+};
+
+/* TODO: DocumentView is supposed to be useful on its own; move to a separate source file. */
+iDeclareType(DocumentView)
+
+struct Impl_DocumentView {
+    iDocumentWidget *owner; /* TODO: Convert to an abstract provider of metrics? */
+    iGmDocument *  doc;
+    int            pageMargin;
+    iSmoothScroll  scrollY;
+    iAnim          sideOpacity;
+    iAnim          altTextOpacity;
+    iGmRunRange    visibleRuns;
+    iPtrArray      visibleLinks;
+    iPtrArray      visiblePre;
+    iPtrArray      visibleMedia; /* currently playing audio / ongoing downloads */
+    iPtrArray      visibleWideRuns; /* scrollable blocks; TODO: merge into `visiblePre` */
+    const iGmRun * hoverPre;    /* for clicking */
+    const iGmRun * hoverAltPre; /* for drawing alt text */
+    const iGmRun * hoverLink;
+    iArray         wideRunOffsets;
+    iAnim          animWideRunOffset;
+    uint16_t       animWideRunId;
+    iGmRunRange    animWideRunRange;
+    iDrawBufs *    drawBufs; /* dynamic state for drawing */
+    iVisBuf *      visBuf;
+    iVisBufMeta *  visBufMeta;
+    iGmRunRange    renderRuns;
+    iPtrSet *      invalidRuns;
+};
+
 struct Impl_DocumentWidget {
     iWidget        widget;
     int            flags; /* internal behavior, see enum iDocumentWidgetFlag */
-    
+
     /* User interface: */
     enum iDocumentLinkOrdinalMode ordinalMode;
     size_t         ordinalBase;
@@ -251,19 +285,22 @@ struct Impl_DocumentWidget {
     const iGmRun * grabbedPlayer; /* currently adjusting volume in a player */
     float          grabbedStartVolume;
     int            mediaTimer;
-    const iGmRun * hoverPre;    /* for clicking */
-    const iGmRun * hoverAltPre; /* for drawing alt text */
-    const iGmRun * hoverLink;
     const iGmRun * contextLink;
     iClick         click;
     iInt2          contextPos; /* coordinates of latest right click */
     int            pinchZoomInitial;
     int            pinchZoomPosted;
+    float          swipeSpeed; /* points/sec */
+    uint32_t       lastSwipeTime;
+    int            wheelSwipeDistance;
+    enum iWheelSwipeState wheelSwipeState;
     iString        pendingGotoHeading;
-    
+    iString        linePrecedingLink;
+
     /* Network request: */
     enum iRequestState state;
     iGmRequest *   request;
+    iGmLinkId      requestLinkId; /* ID of the link that initiated the current request */
     iAtomicInt     isRequestUpdated; /* request has new content, need to parse it */
     int            certFlags;
     iBlock *       certFingerprint;
@@ -271,7 +308,7 @@ struct Impl_DocumentWidget {
     iString *      certSubject;
     int            redirectCount;
     iObjectList *  media; /* inline media requests */
-    
+
     /* Document: */
     iPersistentDocumentState mod;
     iString *      titleUser;
@@ -281,31 +318,14 @@ struct Impl_DocumentWidget {
     iBlock         sourceContent; /* original content as received, for saving; set on request finish */
     iTime          sourceTime;
     iGempub *      sourceGempub; /* NULL unless the page is Gempub content */
-    iGmDocument *  doc;
     iBanner *      banner;
-    
-    /* Rendering: */
-    int            pageMargin;
     float          initNormScrollY;
-    iSmoothScroll  scrollY;
-    iAnim          sideOpacity;
-    iAnim          altTextOpacity;
-    iGmRunRange    visibleRuns;
-    iPtrArray      visibleLinks;
-    iPtrArray      visiblePre;
-    iPtrArray      visibleMedia; /* currently playing audio / ongoing downloads */   
-    iPtrArray      visibleWideRuns; /* scrollable blocks; TODO: merge into `visiblePre` */
-    iArray         wideRunOffsets;
-    iAnim          animWideRunOffset;
-    uint16_t       animWideRunId;
-    iGmRunRange    animWideRunRange;
-    iDrawBufs *    drawBufs; /* dynamic state for drawing */
-    iVisBuf *      visBuf;    
-    iVisBufMeta *  visBufMeta;
-    iGmRunRange    renderRuns;
-    iPtrSet *      invalidRuns;
-    
-    /* Widget structure: */    
+
+    /* Rendering: */
+    iDocumentView  view;
+    iLinkInfo *    linkInfo;
+
+    /* Widget structure: */
     iScrollWidget *scroll;
     iWidget *      footerButtons;
     iWidget *      menu;
@@ -317,46 +337,159 @@ struct Impl_DocumentWidget {
 
 iDefineObjectConstruction(DocumentWidget)
 
+/* Sorted by proximity to F and J. */
+static const int homeRowKeys_[] = {
+    'f', 'd', 's', 'a',
+    'j', 'k', 'l',
+    'r', 'e', 'w', 'q',
+    'u', 'i', 'o', 'p',
+    'v', 'c', 'x', 'z',
+    'm', 'n',
+    'g', 'h',
+    'b',
+    't', 'y',
+};
 static int docEnum_ = 0;
 
-void init_DocumentWidget(iDocumentWidget *d) {
-    iWidget *w = as_Widget(d);
-    init_Widget(w);
-    setId_Widget(w, format_CStr("document%03d", ++docEnum_));
-    setFlags_Widget(w, hover_WidgetFlag | noBackground_WidgetFlag, iTrue);
-    if (deviceType_App() != desktop_AppDeviceType) {
-        setFlags_Widget(w, leftEdgeDraggable_WidgetFlag | rightEdgeDraggable_WidgetFlag |
-                        horizontalOffset_WidgetFlag, iTrue);
+static void animate_DocumentWidget_                 (void *ticker);
+static void animateMedia_DocumentWidget_            (iDocumentWidget *d);
+static void updateSideIconBuf_DocumentWidget_       (const iDocumentWidget *d);
+static void prerender_DocumentWidget_               (iAny *);
+static void scrollBegan_DocumentWidget_             (iAnyObject *, int, uint32_t);
+static void refreshWhileScrolling_DocumentWidget_   (iAny *);
+
+/* TODO: The following methods are called from DocumentView, which goes the wrong way. */
+
+static iRangecc selectMark_DocumentWidget_(const iDocumentWidget *d) {
+    /* Normalize so start < end. */
+    iRangecc norm = d->selectMark;
+    if (norm.start > norm.end) {
+        iSwap(const char *, norm.start, norm.end);
     }
-    init_PersistentDocumentState(&d->mod);
-    d->flags           = 0;
-    d->phoneToolbar    = NULL;
-    d->footerButtons   = NULL;
-    iZap(d->certExpiry);
-    d->certFingerprint  = new_Block(0);
-    d->certFlags        = 0;
-    d->certSubject      = new_String();
-    d->state            = blank_RequestState;
-    d->titleUser        = new_String();
-    d->request          = NULL;
-    d->isRequestUpdated = iFalse;
-    d->media            = new_ObjectList();
+    return norm;
+}
+
+static int phoneToolbarHeight_DocumentWidget_(const iDocumentWidget *d) {
+    if (!d->phoneToolbar) {
+        return 0;
+    }
+    const iWidget *w = constAs_Widget(d);
+    return bottom_Rect(rect_Root(w->root)) - top_Rect(boundsWithoutVisualOffset_Widget(d->phoneToolbar));
+}
+
+static int footerHeight_DocumentWidget_(const iDocumentWidget *d) {
+    int hgt = height_Widget(d->footerButtons);
+    if (isPortraitPhone_App()) {
+        hgt += phoneToolbarHeight_DocumentWidget_(d);
+    }
+    return hgt;
+}
+
+static iBool isHoverAllowed_DocumentWidget_(const iDocumentWidget *d) {
+    if (!isHover_Widget(d)) {
+        return iFalse;
+    }
+    if (!(d->state == ready_RequestState || d->state == receivedPartialResponse_RequestState)) {
+        return iFalse;
+    }
+    if (d->flags & (noHoverWhileScrolling_DocumentWidgetFlag |
+                    drawDownloadCounter_DocumentWidgetFlag)) {
+        return iFalse;
+    }
+    if (d->flags & pinchZoom_DocumentWidgetFlag) {
+        return iFalse;
+    }
+    if (flags_Widget(constAs_Widget(d)) & touchDrag_WidgetFlag) {
+        return iFalse;
+    }
+    if (flags_Widget(constAs_Widget(d->scroll)) & pressed_WidgetFlag) {
+        return iFalse;
+    }
+    return iTrue;
+}
+
+static iMediaRequest *findMediaRequest_DocumentWidget_(const iDocumentWidget *d, iGmLinkId linkId) {
+    iConstForEach(ObjectList, i, d->media) {
+        const iMediaRequest *req = (const iMediaRequest *) i.object;
+        if (req->linkId == linkId) {
+            return iConstCast(iMediaRequest *, req);
+        }
+    }
+    return NULL;
+}
+
+static size_t linkOrdinalFromKey_DocumentWidget_(const iDocumentWidget *d, int key) {
+    size_t ord = iInvalidPos;
+    if (d->ordinalMode == numbersAndAlphabet_DocumentLinkOrdinalMode) {
+        if (key >= '1' && key <= '9') {
+            return key - '1';
+        }
+        if (key < 'a' || key > 'z') {
+            return iInvalidPos;
+        }
+        ord = key - 'a' + 9;
+#if defined (iPlatformApple)
+        /* Skip keys that would conflict with default system shortcuts: hide, minimize, quit, close. */
+        if (key == 'h' || key == 'm' || key == 'q' || key == 'w') {
+            return iInvalidPos;
+        }
+        if (key > 'h') ord--;
+        if (key > 'm') ord--;
+        if (key > 'q') ord--;
+        if (key > 'w') ord--;
+#endif
+    }
+    else {
+        iForIndices(i, homeRowKeys_) {
+            if (homeRowKeys_[i] == key) {
+                return i;
+            }
+        }
+    }
+    return ord;
+}
+
+static iChar linkOrdinalChar_DocumentWidget_(const iDocumentWidget *d, size_t ord) {
+    if (d->ordinalMode == numbersAndAlphabet_DocumentLinkOrdinalMode) {
+        if (ord < 9) {
+            return '1' + ord;
+        }
+#if defined (iPlatformApple)
+        if (ord < 9 + 22) {
+            int key = 'a' + ord - 9;
+            if (key >= 'h') key++;
+            if (key >= 'm') key++;
+            if (key >= 'q') key++;
+            if (key >= 'w') key++;
+            return 'A' + key - 'a';
+        }
+#else
+        if (ord < 9 + 26) {
+            return 'A' + ord - 9;
+        }
+#endif
+    }
+    else {
+        if (ord < iElemCount(homeRowKeys_)) {
+            return 'A' + homeRowKeys_[ord] - 'a';
+        }
+    }
+    return 0;
+}
+
+/*----------------------------------------------------------------------------------------------*/
+
+void init_DocumentView(iDocumentView *d) {
+    d->owner            = NULL;
     d->doc              = new_GmDocument();
-    d->banner           = new_Banner();
-    setOwner_Banner(d->banner, d);
-    d->redirectCount    = 0;
-    d->ordinalBase      = 0;
-    d->initNormScrollY  = 0;
-    init_SmoothScroll(&d->scrollY, w, scrollBegan_DocumentWidget_);
+    d->invalidRuns      = new_PtrSet();
+    d->drawBufs         = new_DrawBufs();
+    d->pageMargin       = 5;
+    d->hoverPre      = NULL;
+    d->hoverAltPre   = NULL;
+    d->hoverLink     = NULL;
     d->animWideRunId = 0;
     init_Anim(&d->animWideRunOffset, 0);
-    d->selectMark       = iNullRange;
-    d->foundMark        = iNullRange;
-    d->pageMargin       = 5;
-    d->hoverPre         = NULL;
-    d->hoverAltPre      = NULL;
-    d->hoverLink        = NULL;
-    d->contextLink      = NULL;
     iZap(d->renderRuns);
     iZap(d->visibleRuns);
     d->visBuf = new_VisBuf(); {
@@ -367,212 +500,105 @@ void init_DocumentWidget(iDocumentWidget *d) {
             d->visBuf->buffers[i].user = d->visBufMeta + i;
         }
     }
-    d->invalidRuns = new_PtrSet();
     init_Anim(&d->sideOpacity, 0);
     init_Anim(&d->altTextOpacity, 0);
-    d->sourceStatus = none_GmStatusCode;
-    init_String(&d->sourceHeader);
-    init_String(&d->sourceMime);
-    init_Block(&d->sourceContent, 0);
-    iZap(d->sourceTime);
-    d->sourceGempub = NULL;
     init_PtrArray(&d->visibleLinks);
     init_PtrArray(&d->visiblePre);
     init_PtrArray(&d->visibleWideRuns);
     init_Array(&d->wideRunOffsets, sizeof(int));
     init_PtrArray(&d->visibleMedia);
-    d->grabbedPlayer = NULL;
-    d->mediaTimer    = 0;
-    init_String(&d->pendingGotoHeading);
-    init_Click(&d->click, d, SDL_BUTTON_LEFT);
-    addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
-    d->menu         = NULL; /* created when clicking */
-    d->playerMenu   = NULL;
-    d->copyMenu     = NULL;
-    d->drawBufs     = new_DrawBufs();
-    d->translation  = NULL;
-    addChildFlags_Widget(w,
-                         iClob(new_IndicatorWidget()),
-                         resizeToParentWidth_WidgetFlag | resizeToParentHeight_WidgetFlag);
-#if !defined (iPlatformAppleDesktop) /* in system menu */
-    addAction_Widget(w, reload_KeyShortcut, "navigate.reload");
-    addAction_Widget(w, closeTab_KeyShortcut, "tabs.close");
-    addAction_Widget(w, SDLK_d, KMOD_PRIMARY, "bookmark.add");
-    addAction_Widget(w, subscribeToPage_KeyModifier, "feeds.subscribe");
-#endif
-    addAction_Widget(w, navigateBack_KeyShortcut, "navigate.back");
-    addAction_Widget(w, navigateForward_KeyShortcut, "navigate.forward");
-    addAction_Widget(w, navigateParent_KeyShortcut, "navigate.parent");
-    addAction_Widget(w, navigateRoot_KeyShortcut, "navigate.root");
 }
 
-void cancelAllRequests_DocumentWidget(iDocumentWidget *d) {
-    iForEach(ObjectList, i, d->media) {
-        iMediaRequest *mr = i.object;
-        cancel_GmRequest(mr->req);
-    }
-    if (d->request) {
-        cancel_GmRequest(d->request);
-    }
-}
-
-void deinit_DocumentWidget(iDocumentWidget *d) {
-    cancelAllRequests_DocumentWidget(d);
-    pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
-    removeTicker_App(animate_DocumentWidget_, d);
-    removeTicker_App(prerender_DocumentWidget_, d);
-    remove_Periodic(periodic_App(), d);
-    delete_Translation(d->translation);
+void deinit_DocumentView(iDocumentView *d) {
     delete_DrawBufs(d->drawBufs);
     delete_VisBuf(d->visBuf);
     free(d->visBufMeta);
     delete_PtrSet(d->invalidRuns);
-    iRelease(d->media);
-    iRelease(d->request);
-    delete_Gempub(d->sourceGempub);
-    deinit_String(&d->pendingGotoHeading);
-    deinit_Block(&d->sourceContent);
-    deinit_String(&d->sourceMime);
-    deinit_String(&d->sourceHeader);
-    delete_Banner(d->banner);
-    iRelease(d->doc);
-    if (d->mediaTimer) {
-        SDL_RemoveTimer(d->mediaTimer);
-    }
     deinit_Array(&d->wideRunOffsets);
     deinit_PtrArray(&d->visibleMedia);
     deinit_PtrArray(&d->visibleWideRuns);
     deinit_PtrArray(&d->visiblePre);
     deinit_PtrArray(&d->visibleLinks);
-    delete_Block(d->certFingerprint);
-    delete_String(d->certSubject);
-    delete_String(d->titleUser);
-    deinit_PersistentDocumentState(&d->mod);
-}
-
-static iRangecc selectMark_DocumentWidget_(const iDocumentWidget *d) {
-    /* Normalize so start < end. */
-    iRangecc norm = d->selectMark;
-    if (norm.start > norm.end) {
-        iSwap(const char *, norm.start, norm.end);
-    }
-    return norm;
+    iReleasePtr(&d->doc);
 }
 
-static void enableActions_DocumentWidget_(iDocumentWidget *d, iBool enable) {
-    /* Actions are invisible child widgets of the DocumentWidget. */
-    iForEach(ObjectList, i, children_Widget(d)) {
-        if (isAction_Widget(i.object)) {
-            setFlags_Widget(i.object, disabled_WidgetFlag, !enable);
-        }
-    }
-}
-
-static void setLinkNumberMode_DocumentWidget_(iDocumentWidget *d, iBool set) {
-    iChangeFlags(d->flags, showLinkNumbers_DocumentWidgetFlag, set);
-    /* Children have priority when handling events. */
-    enableActions_DocumentWidget_(d, !set);
-    if (d->menu) {
-        setFlags_Widget(d->menu, disabled_WidgetFlag, set);
+static void setOwner_DocumentView_(iDocumentView *d, iDocumentWidget *doc) {
+    d->owner = doc;
+    init_SmoothScroll(&d->scrollY, as_Widget(doc), scrollBegan_DocumentWidget_);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        d->scrollY.flags |= pullDownAction_SmoothScrollFlag; /* pull to refresh */
     }
 }
 
-static void resetWideRuns_DocumentWidget_(iDocumentWidget *d) {
+static void resetWideRuns_DocumentView_(iDocumentView *d) {
     clear_Array(&d->wideRunOffsets);
     d->animWideRunId = 0;
     init_Anim(&d->animWideRunOffset, 0);
     iZap(d->animWideRunRange);
 }
 
-static void requestUpdated_DocumentWidget_(iAnyObject *obj) {
-    iDocumentWidget *d = obj;
-    const int wasUpdated = exchange_Atomic(&d->isRequestUpdated, iTrue);
-    if (!wasUpdated) {
-        postCommand_Widget(obj,
-                           "document.request.updated doc:%p reqid:%u request:%p",
-                           d,
-                           id_GmRequest(d->request),
-                           d->request);
-    }
-}
-
-static void requestFinished_DocumentWidget_(iAnyObject *obj) {
-    iDocumentWidget *d = obj;
-    postCommand_Widget(obj,
-                       "document.request.finished doc:%p reqid:%u request:%p",
-                       d,
-                       id_GmRequest(d->request),
-                       d->request);
-}
-
-static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
-    const iWidget *w        = constAs_Widget(d);
+static int documentWidth_DocumentView_(const iDocumentView *d) {
+    const iWidget *w        = constAs_Widget(d->owner);
     const iRect    bounds   = bounds_Widget(w);
     const iPrefs * prefs    = prefs_App();
     const int      minWidth = 50 * gap_UI; /* lines must fit a word at least */
     const float    adjust   = iClamp((float) bounds.size.x / gap_UI / 11 - 12,
-                                     -1.0f, 10.0f); /* adapt to width */
+                                -1.0f, 10.0f); /* adapt to width */
     //printf("%f\n", adjust); fflush(stdout);
     return iMini(iMax(minWidth, bounds.size.x - gap_UI * (d->pageMargin + adjust) * 2),
                  fontSize_UI * //emRatio_Text(paragraph_FontId) * /* dependent on avg. glyph width */
-                 prefs->lineWidth * prefs->zoomPercent / 100);
+                     prefs->lineWidth * prefs->zoomPercent / 100);
 }
 
-static int documentTopPad_DocumentWidget_(const iDocumentWidget *d) {
+static int documentTopPad_DocumentView_(const iDocumentView *d) {
     /* Amount of space between banner and top of the document. */
-    return isEmpty_Banner(d->banner) ? 0 : lineHeight_Text(paragraph_FontId);
-}
-
-static int documentTopMargin_DocumentWidget_(const iDocumentWidget *d) {
-    return (isEmpty_Banner(d->banner) ? d->pageMargin * gap_UI : height_Banner(d->banner)) +
-           documentTopPad_DocumentWidget_(d);
+    return isEmpty_Banner(d->owner->banner) ? 0 : lineHeight_Text(paragraph_FontId);
 }
 
-static int pageHeight_DocumentWidget_(const iDocumentWidget *d) {
-    return height_Banner(d->banner) + documentTopPad_DocumentWidget_(d) + size_GmDocument(d->doc).y;
+static int documentTopMargin_DocumentView_(const iDocumentView *d) {
+    return (isEmpty_Banner(d->owner->banner) ? d->pageMargin * gap_UI : height_Banner(d->owner->banner)) +
+           documentTopPad_DocumentView_(d);
 }
 
-static int footerButtonsHeight_DocumentWidget_(const iDocumentWidget *d) {
-    int height = height_Widget(d->footerButtons);
-//    if (height) {
-//        height += 3 * gap_UI; /* padding */
-//    }
-    return height;
+static int pageHeight_DocumentView_(const iDocumentView *d) {
+    return height_Banner(d->owner->banner) + documentTopPad_DocumentView_(d) + size_GmDocument(d->doc).y;
 }
 
-static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
-    const iRect bounds = bounds_Widget(constAs_Widget(d));
+static iRect documentBounds_DocumentView_(const iDocumentView *d) {
+    const iRect bounds = bounds_Widget(constAs_Widget(d->owner));
     const int   margin = gap_UI * d->pageMargin;
     iRect       rect;
-    rect.size.x = documentWidth_DocumentWidget_(d);
+    rect.size.x = documentWidth_DocumentView_(d);
     rect.pos.x  = mid_Rect(bounds).x - rect.size.x / 2;
     rect.pos.y  = top_Rect(bounds) + margin;
     rect.size.y = height_Rect(bounds) - margin;
     iBool wasCentered = iFalse;
-    if (d->flags & centerVertically_DocumentWidgetFlag) {
+    /* TODO: Further separation of View and Widget: configure header and footer heights
+       without involving the widget here. */
+    if (d->owner->flags & centerVertically_DocumentWidgetFlag) {
         const int docSize = size_GmDocument(d->doc).y +
-                            documentTopMargin_DocumentWidget_(d);
+                            documentTopMargin_DocumentView_(d);
         if (size_GmDocument(d->doc).y == 0) {
             /* Document is empty; maybe just showing an error banner. */
             rect.pos.y = top_Rect(bounds) + height_Rect(bounds) / 2 -
-                documentTopPad_DocumentWidget_(d) - height_Banner(d->banner) / 2;
+                         documentTopPad_DocumentView_(d) - height_Banner(d->owner->banner) / 2;
             rect.size.y = 0;
             wasCentered = iTrue;
         }
-        else if (docSize < rect.size.y - footerButtonsHeight_DocumentWidget_(d)) {
+        else if (docSize < rect.size.y - footerHeight_DocumentWidget_(d->owner)) {
             /* TODO: Phone toolbar? */
             /* Center vertically when the document is short. */
-            const int relMidY   = (height_Rect(bounds) - footerButtonsHeight_DocumentWidget_(d)) / 2;
+            const int relMidY   = (height_Rect(bounds) - footerHeight_DocumentWidget_(d->owner)) / 2;
             const int visHeight = size_GmDocument(d->doc).y;
-            const int offset    = -height_Banner(d->banner) - documentTopPad_DocumentWidget_(d);
+            const int offset    = -height_Banner(d->owner->banner) - documentTopPad_DocumentView_(d);
             rect.pos.y  = top_Rect(bounds) + iMaxi(0, relMidY - visHeight / 2 + offset);
-            rect.size.y = size_GmDocument(d->doc).y + documentTopMargin_DocumentWidget_(d);
+            rect.size.y = size_GmDocument(d->doc).y + documentTopMargin_DocumentView_(d);
             wasCentered = iTrue;
         }
     }
     if (!wasCentered) {
         /* The banner overtakes the top margin. */
-        if (!isEmpty_Banner(d->banner)) {
+        if (!isEmpty_Banner(d->owner->banner)) {
             rect.pos.y -= margin;
         }
         else {
@@ -582,38 +608,28 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
     return rect;
 }
 
-static int viewPos_DocumentWidget_(const iDocumentWidget *d) {
-    return height_Banner(d->banner) + documentTopPad_DocumentWidget_(d) - pos_SmoothScroll(&d->scrollY);
-}
-
-#if 0
-static iRect siteBannerRect_DocumentWidget_(const iDocumentWidget *d) {
-    const iGmRun *banner = siteBanner_GmDocument(d->doc);
-    if (!banner) {
-        return zero_Rect();
-    }
-    const iRect docBounds = documentBounds_DocumentWidget_(d);
-    const iInt2 origin = addY_I2(topLeft_Rect(docBounds), -pos_SmoothScroll(&d->scrollY));
-    return moved_Rect(banner->visBounds, origin);
+static int viewPos_DocumentView_(const iDocumentView *d) {
+    return height_Banner(d->owner->banner) + documentTopPad_DocumentView_(d) -
+           pos_SmoothScroll(&d->scrollY);
 }
-#endif
 
-static iInt2 documentPos_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
-    return addY_I2(sub_I2(pos, topLeft_Rect(documentBounds_DocumentWidget_(d))),
-                   -viewPos_DocumentWidget_(d));
+static iInt2 documentPos_DocumentView_(const iDocumentView *d, iInt2 pos) {
+    return addY_I2(sub_I2(pos, topLeft_Rect(documentBounds_DocumentView_(d))),
+                   -viewPos_DocumentView_(d));
 }
 
-static iRangei visibleRange_DocumentWidget_(const iDocumentWidget *d) {
-    int top = pos_SmoothScroll(&d->scrollY) - height_Banner(d->banner) - documentTopPad_DocumentWidget_(d);
-    if (isEmpty_Banner(d->banner)) {
+static iRangei visibleRange_DocumentView_(const iDocumentView *d) {
+    int top = pos_SmoothScroll(&d->scrollY) - height_Banner(d->owner->banner) -
+              documentTopPad_DocumentView_(d);
+    if (isEmpty_Banner(d->owner->banner)) {
         /* Top padding is not collapsed. */
         top -= d->pageMargin * gap_UI;
     }
-    return (iRangei){ top, top + height_Rect(bounds_Widget(constAs_Widget(d))) };
+    return (iRangei){ top, top + height_Rect(bounds_Widget(constAs_Widget(d->owner))) };
 }
 
-static void addVisible_DocumentWidget_(void *context, const iGmRun *run) {
-    iDocumentWidget *d = context;
+static void addVisible_DocumentView_(void *context, const iGmRun *run) {
+    iDocumentView *d = context;
     if (~run->flags & decoration_GmRunFlag && !run->mediaId) {
         if (!d->visibleRuns.start) {
             d->visibleRuns.start = run;
@@ -636,7 +652,7 @@ static void addVisible_DocumentWidget_(void *context, const iGmRun *run) {
     }
 }
 
-static const iGmRun *lastVisibleLink_DocumentWidget_(const iDocumentWidget *d) {
+static const iGmRun *lastVisibleLink_DocumentView_(const iDocumentView *d) {
     iReverseConstForEach(PtrArray, i, &d->visibleLinks) {
         const iGmRun *run = i.ptr;
         if (run->flags & decoration_GmRunFlag && run->linkId) {
@@ -646,23 +662,24 @@ static const iGmRun *lastVisibleLink_DocumentWidget_(const iDocumentWidget *d) {
     return NULL;
 }
 
-static float normScrollPos_DocumentWidget_(const iDocumentWidget *d) {
-    const int docSize = pageHeight_DocumentWidget_(d); //  size_GmDocument(d->doc).y;
+static float normScrollPos_DocumentView_(const iDocumentView *d) {
+    const int docSize = pageHeight_DocumentView_(d);
     if (docSize) {
-        return pos_SmoothScroll(&d->scrollY) / (float) docSize;
+        float pos = pos_SmoothScroll(&d->scrollY) / (float) docSize;
+        return iMax(pos, 0.0f);
     }
     return 0;
 }
 
-static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
-    const iWidget *w = constAs_Widget(d);
-    int sm = pageHeight_DocumentWidget_(d) - height_Rect(bounds_Widget(w)) +
-             (isEmpty_Banner(d->banner) ? 2 : 1) * d->pageMargin * gap_UI + /* top and bottom margins */
-             iMax(height_Widget(d->phoneToolbar), height_Widget(d->footerButtons));
+static int scrollMax_DocumentView_(const iDocumentView *d) {
+    const iWidget *w = constAs_Widget(d->owner);
+    int sm = pageHeight_DocumentView_(d) +
+             (isEmpty_Banner(d->owner->banner) ? 2 : 1) * d->pageMargin * gap_UI + /* top and bottom margins */
+             footerHeight_DocumentWidget_(d->owner) - height_Rect(bounds_Widget(w));
     return sm;
 }
 
-static void invalidateLink_DocumentWidget_(iDocumentWidget *d, iGmLinkId id) {
+static void invalidateLink_DocumentView_(iDocumentView *d, iGmLinkId id) {
     /* A link has multiple runs associated with it. */
     iConstForEach(PtrArray, i, &d->visibleLinks) {
         const iGmRun *run = i.ptr;
@@ -672,7 +689,7 @@ static void invalidateLink_DocumentWidget_(iDocumentWidget *d, iGmLinkId id) {
     }
 }
 
-static void invalidateVisibleLinks_DocumentWidget_(iDocumentWidget *d) {
+static void invalidateVisibleLinks_DocumentView_(iDocumentView *d) {
     iConstForEach(PtrArray, i, &d->visibleLinks) {
         const iGmRun *run = i.ptr;
         if (run->linkId) {
@@ -681,7 +698,7 @@ static void invalidateVisibleLinks_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
-static int runOffset_DocumentWidget_(const iDocumentWidget *d, const iGmRun *run) {
+static int runOffset_DocumentView_(const iDocumentView *d, const iGmRun *run) {
     if (preId_GmRun(run) && run->flags & wide_GmRunFlag) {
         if (d->animWideRunId == preId_GmRun(run)) {
             return -value_Anim(&d->animWideRunOffset);
@@ -695,56 +712,24 @@ static int runOffset_DocumentWidget_(const iDocumentWidget *d, const iGmRun *run
     return 0;
 }
 
-static void invalidateWideRunsWithNonzeroOffset_DocumentWidget_(iDocumentWidget *d) {
+static void invalidateWideRunsWithNonzeroOffset_DocumentView_(iDocumentView *d) {
     iConstForEach(PtrArray, i, &d->visibleWideRuns) {
         const iGmRun *run = i.ptr;
-        if (runOffset_DocumentWidget_(d, run)) {
+        if (runOffset_DocumentView_(d, run)) {
             insert_PtrSet(d->invalidRuns, run);
         }
     }
 }
 
-static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse);
-
-static void animate_DocumentWidget_(void *ticker) {
-    iDocumentWidget *d = ticker;
-    refresh_Widget(d);
-    if (!isFinished_Anim(&d->sideOpacity) || !isFinished_Anim(&d->altTextOpacity)) {
-        addTicker_App(animate_DocumentWidget_, d);
-    }
-}
-
-static iBool isHoverAllowed_DocumentWidget_(const iDocumentWidget *d) {
-    if (!isHover_Widget(d)) {
-        return iFalse;
-    }
-    if (!(d->state == ready_RequestState || d->state == receivedPartialResponse_RequestState)) {
-        return iFalse;
-    }
-    if (d->flags & noHoverWhileScrolling_DocumentWidgetFlag) {
-        return iFalse;
-    }
-    if (d->flags & pinchZoom_DocumentWidgetFlag) {
-        return iFalse;
-    }
-    if (flags_Widget(constAs_Widget(d)) & touchDrag_WidgetFlag) {
-        return iFalse;
-    }
-    if (flags_Widget(constAs_Widget(d->scroll)) & pressed_WidgetFlag) {
-        return iFalse;
-    }
-    return iTrue;
-}
-
-static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
-    const iWidget *w            = constAs_Widget(d);
-    const iRect    docBounds    = documentBounds_DocumentWidget_(d);
+static void updateHover_DocumentView_(iDocumentView *d, iInt2 mouse) {
+    const iWidget *w            = constAs_Widget(d->owner);
+    const iRect    docBounds    = documentBounds_DocumentView_(d);
     const iGmRun * oldHoverLink = d->hoverLink;
-    d->hoverPre                 = NULL;
-    d->hoverLink                = NULL;
+    d->hoverPre          = NULL;
+    d->hoverLink         = NULL;
     const iInt2 hoverPos = addY_I2(sub_I2(mouse, topLeft_Rect(docBounds)),
-                                   -viewPos_DocumentWidget_(d));
-    if (isHoverAllowed_DocumentWidget_(d)) {
+                                   -viewPos_DocumentView_(d));
+    if (isHoverAllowed_DocumentWidget_(d->owner)) {
         iConstForEach(PtrArray, i, &d->visibleLinks) {
             const iGmRun *run = i.ptr;
             /* Click targets are slightly expanded so there are no gaps between links. */
@@ -756,15 +741,21 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
     }
     if (d->hoverLink != oldHoverLink) {
         if (oldHoverLink) {
-            invalidateLink_DocumentWidget_(d, oldHoverLink->linkId);
+            invalidateLink_DocumentView_(d, oldHoverLink->linkId);
         }
         if (d->hoverLink) {
-            invalidateLink_DocumentWidget_(d, d->hoverLink->linkId);
+            invalidateLink_DocumentView_(d, d->hoverLink->linkId);
+        }
+        if (update_LinkInfo(d->owner->linkInfo,
+                            d->doc,
+                            d->hoverLink ? d->hoverLink->linkId : 0,
+                            width_Widget(w))) {
+            animate_DocumentWidget_(d->owner);
         }
         refresh_Widget(w);
     }
     /* Hovering over preformatted blocks. */
-    if (isHoverAllowed_DocumentWidget_(d)) {
+    if (isHoverAllowed_DocumentWidget_(d->owner)) {
         iConstForEach(PtrArray, j, &d->visiblePre) {
             const iGmRun *run = j.ptr;
             if (contains_Rect(run->bounds, hoverPos)) {
@@ -777,18 +768,18 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
     if (!d->hoverPre) {
         setValueSpeed_Anim(&d->altTextOpacity, 0.0f, 1.5f);
         if (!isFinished_Anim(&d->altTextOpacity)) {
-            animate_DocumentWidget_(d);
+            animate_DocumentWidget_(d->owner);
         }
     }
     else if (d->hoverPre &&
              preHasAltText_GmDocument(d->doc, preId_GmRun(d->hoverPre)) &&
-             ~d->flags & noHoverWhileScrolling_DocumentWidgetFlag) {
+             ~d->owner->flags & noHoverWhileScrolling_DocumentWidgetFlag) {
         setValueSpeed_Anim(&d->altTextOpacity, 1.0f, 1.5f);
         if (!isFinished_Anim(&d->altTextOpacity)) {
-            animate_DocumentWidget_(d);
+            animate_DocumentWidget_(d->owner);
         }
     }
-    if (isHover_Widget(w) && !contains_Widget(constAs_Widget(d->scroll), mouse)) {
+    if (isHover_Widget(w) && !contains_Widget(constAs_Widget(d->owner->scroll), mouse)) {
         setCursor_Window(get_Window(),
                          d->hoverLink || d->hoverPre ? SDL_SYSTEM_CURSOR_HAND
                                                      : SDL_SYSTEM_CURSOR_IBEAM);
@@ -799,15 +790,1198 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
     }
 }
 
-static void updateSideOpacity_DocumentWidget_(iDocumentWidget *d, iBool isAnimated) {
+static void updateSideOpacity_DocumentView_(iDocumentView *d, iBool isAnimated) {
     float opacity = 0.0f;
-//    const iGmRun *banner = siteBanner_GmDocument(d->doc);
-    if (!isEmpty_Banner(d->banner) && height_Banner(d->banner) < pos_SmoothScroll(&d->scrollY)) {
-//    if (banner && bottom_Rect(banner->visBounds) < pos_SmoothScroll(&d->scrollY)) {
+    if (!isEmpty_Banner(d->owner->banner) &&
+        height_Banner(d->owner->banner) < pos_SmoothScroll(&d->scrollY)) {
         opacity = 1.0f;
     }
     setValue_Anim(&d->sideOpacity, opacity, isAnimated ? (opacity < 0.5f ? 100 : 200) : 0);
-    animate_DocumentWidget_(d);
+    animate_DocumentWidget_(d->owner);
+}
+
+static iRangecc currentHeading_DocumentView_(const iDocumentView *d) {
+    iRangecc heading = iNullRange;
+    if (d->visibleRuns.start) {
+        iConstForEach(Array, i, headings_GmDocument(d->doc)) {
+            const iGmHeading *head = i.value;
+            if (head->level == 0) {
+                if (head->text.start <= d->visibleRuns.start->text.start) {
+                    heading = head->text;
+                }
+                if (d->visibleRuns.end && head->text.start > d->visibleRuns.end->text.start) {
+                    break;
+                }
+            }
+        }
+    }
+    return heading;
+}
+
+static int updateScrollMax_DocumentView_(iDocumentView *d) {
+    arrange_Widget(d->owner->footerButtons); /* scrollMax depends on footer height */
+    const int scrollMax = scrollMax_DocumentView_(d);
+    setMax_SmoothScroll(&d->scrollY, scrollMax);
+    return scrollMax;
+}
+
+static void updateVisible_DocumentView_(iDocumentView *d) {
+    /* TODO: The concerns of Widget and View are too tangled together here. */
+    iChangeFlags(d->owner->flags,
+                 centerVertically_DocumentWidgetFlag,
+                 prefs_App()->centerShortDocs || startsWithCase_String(d->owner->mod.url, "about:") ||
+                     !isSuccess_GmStatusCode(d->owner->sourceStatus));
+    iScrollWidget *scrollBar = d->owner->scroll;
+    const iRangei visRange  = visibleRange_DocumentView_(d);
+    //    printf("visRange: %d...%d\n", visRange.start, visRange.end);
+    const iRect   bounds    = bounds_Widget(as_Widget(d->owner));
+    const int     scrollMax = updateScrollMax_DocumentView_(d);
+    /* Reposition the footer buttons as appropriate. */
+    setRange_ScrollWidget(scrollBar, (iRangei){ 0, scrollMax });
+    const int docSize = pageHeight_DocumentView_(d) + footerHeight_DocumentWidget_(d->owner);
+    const float scrollPos = pos_SmoothScroll(&d->scrollY);
+    setThumb_ScrollWidget(scrollBar,
+                          pos_SmoothScroll(&d->scrollY),
+                          docSize > 0 ? height_Rect(bounds) * size_Range(&visRange) / docSize : 0);
+    if (d->owner->footerButtons) {
+        const iRect bounds    = bounds_Widget(as_Widget(d->owner));
+        const iRect docBounds = documentBounds_DocumentView_(d);
+        const int   hPad      = (width_Rect(bounds) - iMin(120 * gap_UI, width_Rect(docBounds))) / 2;
+        const int   vPad      = 3 * gap_UI;
+        setPadding_Widget(d->owner->footerButtons, hPad, 0, hPad, vPad);
+        d->owner->footerButtons->rect.pos.y = height_Rect(bounds) -
+                                              footerHeight_DocumentWidget_(d->owner) +
+                                              (scrollMax > 0 ? scrollMax - scrollPos : 0);
+    }
+    clear_PtrArray(&d->visibleLinks);
+    clear_PtrArray(&d->visibleWideRuns);
+    clear_PtrArray(&d->visiblePre);
+    clear_PtrArray(&d->visibleMedia);
+    const iRangecc oldHeading = currentHeading_DocumentView_(d);
+    /* Scan for visible runs. */ {
+        iZap(d->visibleRuns);
+        render_GmDocument(d->doc, visRange, addVisible_DocumentView_, d);
+    }
+    const iRangecc newHeading = currentHeading_DocumentView_(d);
+    if (memcmp(&oldHeading, &newHeading, sizeof(oldHeading))) {
+        d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
+    }
+    updateHover_DocumentView_(d, mouseCoord_Window(get_Window(), 0));
+    updateSideOpacity_DocumentView_(d, iTrue);
+    animateMedia_DocumentWidget_(d->owner);
+    /* Remember scroll positions of recently visited pages. */ {
+        iRecentUrl *recent = mostRecentUrl_History(d->owner->mod.history);
+        if (recent && docSize && d->owner->state == ready_RequestState &&
+            equal_String(&recent->url, d->owner->mod.url)) {
+            recent->normScrollY = normScrollPos_DocumentView_(d);
+        }
+    }
+    /* After scrolling/resizing stops, begin pre-rendering the visbuf contents. */ {
+        removeTicker_App(prerender_DocumentWidget_, d->owner);
+        remove_Periodic(periodic_App(), d);
+        add_Periodic(periodic_App(), d->owner, "document.render");
+    }
+}
+
+static void swap_DocumentView_(iDocumentView *d, iDocumentView *swapBuffersWith) {
+    d->scrollY        = swapBuffersWith->scrollY;
+    d->scrollY.widget = as_Widget(d->owner);
+    iSwap(iVisBuf *,     d->visBuf,     swapBuffersWith->visBuf);
+    iSwap(iVisBufMeta *, d->visBufMeta, swapBuffersWith->visBufMeta);
+    iSwap(iDrawBufs *,   d->drawBufs,   swapBuffersWith->drawBufs);
+    updateVisible_DocumentView_(d);
+    updateVisible_DocumentView_(swapBuffersWith);
+}
+
+static void updateTimestampBuf_DocumentView_(const iDocumentView *d) {
+    if (!isExposed_Window(get_Window())) {
+        return;
+    }
+    if (d->drawBufs->timestampBuf) {
+        delete_TextBuf(d->drawBufs->timestampBuf);
+        d->drawBufs->timestampBuf = NULL;
+    }
+    if (isValid_Time(&d->owner->sourceTime)) {
+        iString *fmt = timeFormatHourPreference_Lang("page.timestamp");
+        d->drawBufs->timestampBuf = newRange_TextBuf(
+            uiLabel_FontId,
+            white_ColorId,
+            range_String(collect_String(format_Time(&d->owner->sourceTime, cstr_String(fmt)))));
+        delete_String(fmt);
+    }
+    d->drawBufs->flags &= ~updateTimestampBuf_DrawBufsFlag;
+}
+
+static void invalidate_DocumentView_(iDocumentView *d) {
+    invalidate_VisBuf(d->visBuf);
+    clear_PtrSet(d->invalidRuns);
+}
+
+static void documentRunsInvalidated_DocumentView_(iDocumentView *d) {
+    d->hoverPre    = NULL;
+    d->hoverAltPre = NULL;
+    d->hoverLink   = NULL;
+    iZap(d->visibleRuns);
+    iZap(d->renderRuns);
+}
+
+static void resetScroll_DocumentView_(iDocumentView *d) {
+    reset_SmoothScroll(&d->scrollY);
+    init_Anim(&d->sideOpacity, 0);
+    init_Anim(&d->altTextOpacity, 0);
+    resetWideRuns_DocumentView_(d);
+}
+
+static void updateWidth_DocumentView_(iDocumentView *d) {
+    updateWidth_GmDocument(d->doc, documentWidth_DocumentView_(d), width_Widget(d->owner));
+}
+
+static void updateWidthAndRedoLayout_DocumentView_(iDocumentView *d) {
+    setWidth_GmDocument(d->doc, documentWidth_DocumentView_(d), width_Widget(d->owner));
+}
+
+static void clampScroll_DocumentView_(iDocumentView *d) {
+    move_SmoothScroll(&d->scrollY, 0);
+}
+
+static void immediateScroll_DocumentView_(iDocumentView *d, int offset) {
+    move_SmoothScroll(&d->scrollY, offset);
+}
+
+static void smoothScroll_DocumentView_(iDocumentView *d, int offset, int duration) {
+    moveSpan_SmoothScroll(&d->scrollY, offset, duration);
+}
+
+static void scrollTo_DocumentView_(iDocumentView *d, int documentY, iBool centered) {
+    if (!isEmpty_Banner(d->owner->banner)) {
+        documentY += height_Banner(d->owner->banner) + documentTopPad_DocumentView_(d);
+    }
+    else {
+        documentY += documentTopPad_DocumentView_(d) + d->pageMargin * gap_UI;
+    }
+    init_Anim(&d->scrollY.pos,
+              documentY - (centered ? documentBounds_DocumentView_(d).size.y / 2
+                                    : lineHeight_Text(paragraph_FontId)));
+    clampScroll_DocumentView_(d);
+}
+
+static void scrollToHeading_DocumentView_(iDocumentView *d, const char *heading) {
+    iConstForEach(Array, h, headings_GmDocument(d->doc)) {
+        const iGmHeading *head = h.value;
+        if (startsWithCase_Rangecc(head->text, heading)) {
+            postCommandf_Root(as_Widget(d->owner)->root, "document.goto loc:%p", head->text.start);
+            break;
+        }
+    }
+}
+
+static iBool scrollWideBlock_DocumentView_(iDocumentView *d, iInt2 mousePos, int delta,
+                                           int duration) {
+    if (delta == 0 || d->owner->flags & eitherWheelSwipe_DocumentWidgetFlag) {
+        return iFalse;
+    }
+    const iInt2 docPos = documentPos_DocumentView_(d, mousePos);
+    iConstForEach(PtrArray, i, &d->visibleWideRuns) {
+        const iGmRun *run = i.ptr;
+        if (docPos.y >= top_Rect(run->bounds) && docPos.y <= bottom_Rect(run->bounds)) {
+            /* We can scroll this run. First find out how much is allowed. */
+            const iGmRunRange range = findPreformattedRange_GmDocument(d->doc, run);
+            int maxWidth = 0;
+            for (const iGmRun *r = range.start; r != range.end; r++) {
+                maxWidth = iMax(maxWidth, width_Rect(r->visBounds));
+            }
+            const int maxOffset = maxWidth - documentWidth_DocumentView_(d) + d->pageMargin * gap_UI;
+            if (size_Array(&d->wideRunOffsets) <= preId_GmRun(run)) {
+                resize_Array(&d->wideRunOffsets, preId_GmRun(run) + 1);
+            }
+            int *offset = at_Array(&d->wideRunOffsets, preId_GmRun(run) - 1);
+            const int oldOffset = *offset;
+            *offset = iClamp(*offset + delta, 0, maxOffset);
+            /* Make sure the whole block gets redraw. */
+            if (oldOffset != *offset) {
+                for (const iGmRun *r = range.start; r != range.end; r++) {
+                    insert_PtrSet(d->invalidRuns, r);
+                }
+                refresh_Widget(d->owner);
+                d->owner->selectMark = iNullRange;
+                d->owner->foundMark  = iNullRange;
+            }
+            if (duration) {
+                if (d->animWideRunId != preId_GmRun(run) || isFinished_Anim(&d->animWideRunOffset)) {
+                    d->animWideRunId = preId_GmRun(run);
+                    init_Anim(&d->animWideRunOffset, oldOffset);
+                }
+                setValueEased_Anim(&d->animWideRunOffset, *offset, duration);
+                d->animWideRunRange = range;
+                addTicker_App(refreshWhileScrolling_DocumentWidget_, d->owner);
+            }
+            else {
+                d->animWideRunId = 0;
+                init_Anim(&d->animWideRunOffset, 0);
+            }
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
+
+static iRangecc sourceLoc_DocumentView_(const iDocumentView *d, iInt2 pos) {
+    return findLoc_GmDocument(d->doc, documentPos_DocumentView_(d, pos));
+}
+
+iDeclareType(MiddleRunParams)
+
+struct Impl_MiddleRunParams {
+    int midY;
+    const iGmRun *closest;
+    int distance;
+};
+
+static void find_MiddleRunParams_(void *params, const iGmRun *run) {
+    iMiddleRunParams *d = params;
+    if (isEmpty_Rect(run->bounds)) {
+        return;
+    }
+    const int distance = iAbs(mid_Rect(run->bounds).y - d->midY);
+    if (!d->closest || distance < d->distance) {
+        d->closest  = run;
+        d->distance = distance;
+    }
+}
+
+static const iGmRun *middleRun_DocumentView_(const iDocumentView *d) {
+    iRangei visRange = visibleRange_DocumentView_(d);
+    iMiddleRunParams params = { (visRange.start + visRange.end) / 2, NULL, 0 };
+    render_GmDocument(d->doc, visRange, find_MiddleRunParams_, &params);
+    return params.closest;
+}
+
+static void allocVisBuffer_DocumentView_(const iDocumentView *d) {
+    const iWidget *w         = constAs_Widget(d->owner);
+    const iBool    isVisible = isVisible_Widget(w);
+    const iInt2    size      = bounds_Widget(w).size;
+    if (isVisible) {
+        alloc_VisBuf(d->visBuf, size, 1);
+    }
+    else {
+        dealloc_VisBuf(d->visBuf);
+    }
+}
+
+static size_t visibleLinkOrdinal_DocumentView_(const iDocumentView *d, iGmLinkId linkId) {
+    size_t ord = 0;
+    const iRangei visRange = visibleRange_DocumentView_(d);
+    iConstForEach(PtrArray, i, &d->visibleLinks) {
+        const iGmRun *run = i.ptr;
+        if (top_Rect(run->visBounds) >= visRange.start + gap_UI * d->pageMargin * 4 / 5) {
+            if (run->flags & decoration_GmRunFlag && run->linkId) {
+                if (run->linkId == linkId) return ord;
+                ord++;
+            }
+        }
+    }
+    return iInvalidPos;
+}
+
+static void documentRunsInvalidated_DocumentWidget_(iDocumentWidget *d) {
+    d->foundMark     = iNullRange;
+    d->selectMark    = iNullRange;
+    d->contextLink   = NULL;
+    documentRunsInvalidated_DocumentView_(&d->view);
+}
+
+static iBool updateDocumentWidthRetainingScrollPosition_DocumentView_(iDocumentView *d,
+                                                                      iBool keepCenter) {
+    const int newWidth = documentWidth_DocumentView_(d);
+    if (newWidth == size_GmDocument(d->doc).x && !keepCenter /* not a font change */) {
+        return iFalse;
+    }
+    /* Font changes (i.e., zooming) will keep the view centered, otherwise keep the top
+       of the visible area fixed. */
+    const iGmRun *run     = keepCenter ? middleRun_DocumentView_(d) : d->visibleRuns.start;
+    const char *  runLoc  = (run ? run->text.start : NULL);
+    int           voffset = 0;
+    if (!keepCenter && run) {
+        /* Keep the first visible run visible at the same position. */
+        /* TODO: First *fully* visible run? */
+        voffset = visibleRange_DocumentView_(d).start - top_Rect(run->visBounds);
+    }
+    setWidth_GmDocument(d->doc, newWidth, width_Widget(d->owner));
+    setWidth_Banner(d->owner->banner, newWidth);
+    documentRunsInvalidated_DocumentWidget_(d->owner);
+    if (runLoc && !keepCenter) {
+        run = findRunAtLoc_GmDocument(d->doc, runLoc);
+        if (run) {
+            scrollTo_DocumentView_(
+                d, top_Rect(run->visBounds) + lineHeight_Text(paragraph_FontId) + voffset, iFalse);
+        }
+    }
+    else if (runLoc && keepCenter) {
+        run = findRunAtLoc_GmDocument(d->doc, runLoc);
+        if (run) {
+            scrollTo_DocumentView_(d, mid_Rect(run->bounds).y, iTrue);
+        }
+    }
+    return iTrue;
+}
+
+static iRect runRect_DocumentView_(const iDocumentView *d, const iGmRun *run) {
+    const iRect docBounds = documentBounds_DocumentView_(d);
+    return moved_Rect(run->bounds, addY_I2(topLeft_Rect(docBounds), viewPos_DocumentView_(d)));
+}
+
+iDeclareType(DrawContext)
+
+struct Impl_DrawContext {
+    const iDocumentView *view;
+    iRect widgetBounds;
+    iRect docBounds;
+    iRangei vis;
+    iInt2 viewPos; /* document area origin */
+    iPaint paint;
+    iBool inSelectMark;
+    iBool inFoundMark;
+    iBool showLinkNumbers;
+    iRect firstMarkRect;
+    iRect lastMarkRect;
+    iGmRunRange runsDrawn;
+};
+
+static void fillRange_DrawContext_(iDrawContext *d, const iGmRun *run, enum iColorId color,
+                                   iRangecc mark, iBool *isInside) {
+    if (mark.start > mark.end) {
+        /* Selection may be done in either direction. */
+        iSwap(const char *, mark.start, mark.end);
+    }
+    if (*isInside || (contains_Range(&run->text, mark.start) ||
+                      contains_Range(&mark, run->text.start))) {
+        int x = 0;
+        if (!*isInside) {
+            x = measureRange_Text(run->font,
+                                  (iRangecc){ run->text.start, iMax(run->text.start, mark.start) })
+                    .advance.x;
+        }
+        int w = width_Rect(run->visBounds) - x;
+        if (contains_Range(&run->text, mark.end) || mark.end < run->text.start) {
+            iRangecc mk = !*isInside ? mark
+                                     : (iRangecc){ run->text.start, iMax(run->text.start, mark.end) };
+            mk.start    = iMax(mk.start, run->text.start);
+            w           = measureRange_Text(run->font, mk).advance.x;
+            *isInside   = iFalse;
+        }
+        else {
+            *isInside = iTrue; /* at least until the next run */
+        }
+        if (w > width_Rect(run->visBounds) - x) {
+            w = width_Rect(run->visBounds) - x;
+        }
+        if (~run->flags & decoration_GmRunFlag) {
+            const iInt2 visPos =
+                add_I2(run->bounds.pos, addY_I2(d->viewPos, viewPos_DocumentView_(d->view)));
+            const iRect rangeRect = { addX_I2(visPos, x), init_I2(w, height_Rect(run->bounds)) };
+            if (rangeRect.size.x) {
+                fillRect_Paint(&d->paint, rangeRect, color);
+                /* Keep track of the first and last marked rects. */
+                if (d->firstMarkRect.size.x == 0) {
+                    d->firstMarkRect = rangeRect;
+                }
+                d->lastMarkRect = rangeRect;
+            }
+        }
+    }
+    /* Link URLs are not part of the visible document, so they are ignored above. Handle
+       these ranges as a special case. */
+    if (run->linkId && run->flags & decoration_GmRunFlag) {
+        const iRangecc url = linkUrlRange_GmDocument(d->view->doc, run->linkId);
+        if (contains_Range(&url, mark.start) &&
+            (contains_Range(&url, mark.end) || url.end == mark.end)) {
+            fillRect_Paint(
+                &d->paint,
+                moved_Rect(run->visBounds, addY_I2(d->viewPos, viewPos_DocumentView_(d->view))),
+                color);
+        }
+    }
+}
+
+static void drawMark_DrawContext_(void *context, const iGmRun *run) {
+    iDrawContext *d = context;
+    if (!isMedia_GmRun(run)) {
+        fillRange_DrawContext_(d, run, uiMatching_ColorId, d->view->owner->foundMark, &d->inFoundMark);
+        fillRange_DrawContext_(d, run, uiMarked_ColorId, d->view->owner->selectMark, &d->inSelectMark);
+    }
+}
+
+static void drawRun_DrawContext_(void *context, const iGmRun *run) {
+    iDrawContext *d      = context;
+    const iInt2   origin = d->viewPos;
+    /* Keep track of the drawn visible runs. */ {
+        if (!d->runsDrawn.start || run < d->runsDrawn.start) {
+            d->runsDrawn.start = run;
+        }
+        if (!d->runsDrawn.end || run > d->runsDrawn.end) {
+            d->runsDrawn.end = run;
+        }
+    }
+    if (run->mediaType == image_MediaType) {
+        SDL_Texture *tex = imageTexture_Media(media_GmDocument(d->view->doc), mediaId_GmRun(run));
+        const iRect dst = moved_Rect(run->visBounds, origin);
+        if (tex) {
+            fillRect_Paint(&d->paint, dst, tmBackground_ColorId); /* in case the image has alpha */
+            SDL_RenderCopy(d->paint.dst->render, tex, NULL,
+                           &(SDL_Rect){ dst.pos.x, dst.pos.y, dst.size.x, dst.size.y });
+        }
+        else {
+            drawRect_Paint(&d->paint, dst, tmQuoteIcon_ColorId);
+            drawCentered_Text(uiLabel_FontId,
+                              dst,
+                              iFalse,
+                              tmQuote_ColorId,
+                              explosion_Icon "  Error Loading Image");
+        }
+        return;
+    }
+    else if (isMedia_GmRun(run)) {
+        /* Media UIs are drawn afterwards as a dynamic overlay. */
+        return;
+    }
+    enum iColorId      fg        = run->color;
+    const iGmDocument *doc       = d->view->doc;
+    const int          linkFlags = linkFlags_GmDocument(doc, run->linkId);
+    /* Hover state of a link. */
+    const iBool isPartOfHover = (run->linkId && d->view->hoverLink &&
+                                 run->linkId == d->view->hoverLink->linkId);
+    iBool isHover = (isPartOfHover && ~run->flags & decoration_GmRunFlag);
+    /* Visible (scrolled) position of the run. */
+    const iInt2 visPos = addX_I2(add_I2(run->visBounds.pos, origin),
+                                 /* Preformatted runs can be scrolled. */
+                                 runOffset_DocumentView_(d->view, run));
+    const iRect visRect = { visPos, run->visBounds.size };
+    /* Fill the background. */ {
+#if 0
+        iBool isInlineImageCaption = run->linkId && linkFlags & content_GmLinkFlag &&
+                                     ~linkFlags & permanent_GmLinkFlag;
+        if (run->flags & decoration_GmRunFlag && ~run->flags & startOfLine_GmRunFlag) {
+            /* This is the metadata. */
+            isInlineImageCaption = iFalse;
+        }
+#endif
+        iBool isMobileHover = deviceType_App() != desktop_AppDeviceType &&
+            (isPartOfHover || contains_PtrSet(d->view->invalidRuns, run)) &&
+            (~run->flags & decoration_GmRunFlag || run->flags & startOfLine_GmRunFlag
+             /* highlight link icon but not image captions */);
+        /* While this is consistent, it's a bit excessive to indicate that an inlined image
+           is open: the image itself is the indication. */
+        const iBool isInlineImageCaption = iFalse;
+        if (run->linkId && (linkFlags & isOpen_GmLinkFlag || isInlineImageCaption || isMobileHover)) {
+            /* Open links get a highlighted background. */
+            int       bg       = tmBackgroundOpenLink_ColorId;
+            if (isMobileHover && !isPartOfHover) {
+                bg = tmBackground_ColorId; /* hover ended and was invalidated */
+            }
+//            const int frame    = tmFrameOpenLink_ColorId;
+            const int pad      = gap_Text;
+            iRect     wideRect = { init_I2(origin.x - pad, visPos.y),
+                               init_I2(d->docBounds.size.x + 2 * pad,
+                                       height_Rect(run->visBounds)) };
+            adjustEdges_Rect(&wideRect,
+                             run->flags & startOfLine_GmRunFlag ? -pad * 3 / 4 : 0, 0,
+                             run->flags & endOfLine_GmRunFlag ? pad * 3 / 4 : 0, 0);
+            /* The first line is composed of two runs that may be drawn in either order, so
+               only draw half of the background. */
+            if (run->flags & decoration_GmRunFlag) {
+                wideRect.size.x = right_Rect(visRect) - left_Rect(wideRect);
+            }
+            else if (run->flags & startOfLine_GmRunFlag) {
+                wideRect.size.x = right_Rect(wideRect) - left_Rect(visRect);
+                wideRect.pos.x  = left_Rect(visRect);
+            }
+            fillRect_Paint(&d->paint, wideRect, bg);
+        }
+        else {
+            /* Normal background for other runs. There are cases when runs get drawn multiple times,
+               e.g., at the buffer boundary, and there are slightly overlapping characters in
+               monospace blocks. Clearing the background here ensures a cleaner visual appearance
+               since only one glyph is visible at any given point. */
+            fillRect_Paint(&d->paint, visRect, tmBackground_ColorId);
+        }
+    }
+    if (run->linkId) {
+        if (run->flags & decoration_GmRunFlag && run->flags & startOfLine_GmRunFlag) {
+            /* Link icon. */
+            if (linkFlags & content_GmLinkFlag) {
+                fg = linkColor_GmDocument(doc, run->linkId, textHover_GmLinkPart);
+            }
+        }
+        else if (~run->flags & decoration_GmRunFlag) {
+            fg = linkColor_GmDocument(doc, run->linkId, isHover ? textHover_GmLinkPart : text_GmLinkPart);
+            if (linkFlags & content_GmLinkFlag) {
+                fg = linkColor_GmDocument(doc, run->linkId, textHover_GmLinkPart); /* link is inactive */
+            }
+        }
+    }
+    if (run->flags & altText_GmRunFlag) {
+        const iInt2 margin = preRunMargin_GmDocument(doc, preId_GmRun(run));
+        fillRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmBackgroundAltText_ColorId);
+        drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmFrameAltText_ColorId);
+        drawWrapRange_Text(run->font,
+                           add_I2(visPos, margin),
+                           run->visBounds.size.x - 2 * margin.x,
+                           run->color,
+                           run->text);
+    }
+    else {
+        if (d->showLinkNumbers && run->linkId && run->flags & decoration_GmRunFlag) {
+            const size_t ord = visibleLinkOrdinal_DocumentView_(d->view, run->linkId);
+            if (ord >= d->view->owner->ordinalBase) {
+                const iChar ordChar =
+                    linkOrdinalChar_DocumentWidget_(d->view->owner, ord - d->view->owner->ordinalBase);
+                if (ordChar) {
+                    const char *circle = "\u25ef"; /* Large Circle */
+                    const int   circleFont = FONT_ID(default_FontId, regular_FontStyle, contentRegular_FontSize);
+                    iRect nbArea = { init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
+                                     init_I2(3.95f * gap_Text, 1.0f * lineHeight_Text(circleFont)) };
+                    drawRange_Text(
+                        circleFont, topLeft_Rect(nbArea), tmQuote_ColorId, range_CStr(circle));
+                    iRect circleArea = visualBounds_Text(circleFont, range_CStr(circle));
+                    addv_I2(&circleArea.pos, topLeft_Rect(nbArea));
+                    drawCentered_Text(FONT_ID(default_FontId, regular_FontStyle, contentSmall_FontSize),
+                                      circleArea,
+                                      iTrue,
+                                      tmQuote_ColorId,
+                                      "%lc",
+                                      (int) ordChar);
+                    goto runDrawn;
+                }
+            }
+        }
+        if (run->flags & quoteBorder_GmRunFlag) {
+            drawVLine_Paint(&d->paint,
+                            addX_I2(visPos,
+                                    !run->isRTL
+                                        ? -gap_Text * 5 / 2
+                                        : (width_Rect(run->visBounds) + gap_Text * 5 / 2)),
+                            height_Rect(run->visBounds),
+                            tmQuoteIcon_ColorId);
+        }
+        /* Base attributes. */ {
+            int f, c;
+            runBaseAttributes_GmDocument(doc, run, &f, &c);
+            setBaseAttributes_Text(f, c);
+        }
+        /* Fancy date in Gemini feed links. */ {
+            if (run->linkId && run->flags & startOfLine_GmRunFlag && ~run->flags & decoration_GmRunFlag) {
+                static iRegExp *datePattern_;
+                if (!datePattern_) {
+                    datePattern_ = new_RegExp("^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]\\s", 0);
+                }
+                iRegExpMatch m;
+                init_RegExpMatch(&m);
+                if (matchRange_RegExp(datePattern_, run->text, &m)) {
+                    /* The date uses regular weight and a dimmed color. */
+                    iString styled;
+                    initRange_String(&styled, run->text);
+                    insertData_Block(&styled.chars, 10, "\x1b[0m", 4); /* restore */
+                    iBlock buf;
+                    init_Block(&buf, 0);
+                    appendCStr_Block(&buf, "\x1b[10m"); /* regular font weight */
+                    appendCStr_Block(&buf, escape_Color(isHover ? fg : tmLinkFeedEntryDate_ColorId));
+                    insertData_Block(&styled.chars, 0, constData_Block(&buf), size_Block(&buf));
+                    deinit_Block(&buf);
+                    const int oldAnsi = ansiFlags_Text();
+                    setAnsiFlags_Text(oldAnsi | allowFontStyle_AnsiFlag);
+                    setBaseAttributes_Text(run->font, fg);
+                    drawBoundRange_Text(run->font,
+                                        visPos,
+                                        (run->isRTL ? -1 : 1) * width_Rect(run->visBounds),
+                                        fg,
+                                        range_String(&styled));
+                    setAnsiFlags_Text(oldAnsi);
+                    deinit_String(&styled);
+                    goto runDrawn;
+                }
+            }
+        }
+        drawBoundRange_Text(run->font,
+                            visPos,
+                            (run->isRTL ? -1 : 1) * width_Rect(run->visBounds),
+                            fg,
+                            run->text);
+    runDrawn:;
+        setBaseAttributes_Text(-1, -1);
+    }
+    /* Presentation of links. */
+    if (run->linkId && ~run->flags & decoration_GmRunFlag) {
+        const int metaFont = paragraph_FontId;
+        /* TODO: Show status of an ongoing media request. */
+        const int flags = linkFlags;
+        const iRect linkRect = moved_Rect(run->visBounds, origin);
+        iMediaRequest *mr = NULL;
+        /* Show metadata about inline content. */
+        if (flags & content_GmLinkFlag && run->flags & endOfLine_GmRunFlag) {
+            fg = linkColor_GmDocument(doc, run->linkId, textHover_GmLinkPart);
+            iString text;
+            init_String(&text);
+            const iMediaId linkMedia = findMediaForLink_Media(constMedia_GmDocument(doc),
+                                                              run->linkId, none_MediaType);
+            iAssert(linkMedia.type != none_MediaType);
+            iGmMediaInfo info;
+            info_Media(constMedia_GmDocument(doc), linkMedia, &info);
+            switch (linkMedia.type) {
+                case image_MediaType: {
+                    /* There's a separate decorative GmRun for the metadata. */
+                    break;
+                }
+                case audio_MediaType:
+                    format_String(&text, "%s", info.type);
+                    break;
+                case download_MediaType:
+                    format_String(&text, "%s", info.type);
+                    break;
+                default:
+                    break;
+            }
+            if (linkMedia.type != download_MediaType && /* can't cancel downloads currently */
+                                                            linkMedia.type != image_MediaType &&
+                findMediaRequest_DocumentWidget_(d->view->owner, run->linkId)) {
+                appendFormat_String(
+                    &text, "  %s" close_Icon, isHover ? escape_Color(tmLinkText_ColorId) : "");
+            }
+            const iInt2 size = measureRange_Text(metaFont, range_String(&text)).bounds.size;
+            if (size.x) {
+                fillRect_Paint(
+                    &d->paint,
+                    (iRect){ add_I2(origin, addX_I2(topRight_Rect(run->bounds), -size.x - gap_UI)),
+                             addX_I2(size, 2 * gap_UI) },
+                    tmBackground_ColorId);
+                drawAlign_Text(metaFont,
+                               add_I2(topRight_Rect(run->bounds), origin),
+                               fg,
+                               right_Alignment,
+                               "%s", cstr_String(&text));
+            }
+            deinit_String(&text);
+        }
+        else if (run->flags & endOfLine_GmRunFlag &&
+                 (mr = findMediaRequest_DocumentWidget_(d->view->owner, run->linkId)) != NULL) {
+            if (!isFinished_GmRequest(mr->req)) {
+                draw_Text(metaFont,
+                          topRight_Rect(linkRect),
+                          tmInlineContentMetadata_ColorId,
+                          translateCStr_Lang(" \u2014 ${doc.fetching}\u2026 (%.1f ${mb})"),
+                          (float) bodySize_GmRequest(mr->req) / 1.0e6f);
+            }
+        }
+    }
+    if (0) {
+        drawRect_Paint(&d->paint, (iRect){ visPos, run->bounds.size }, green_ColorId);
+        drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, red_ColorId);
+    }
+}
+
+static int drawSideRect_(iPaint *p, iRect rect) {
+    int bg = tmBannerBackground_ColorId;
+    int fg = tmBannerIcon_ColorId;
+    if (equal_Color(get_Color(bg), get_Color(tmBackground_ColorId))) {
+        bg = tmBannerIcon_ColorId;
+        fg = tmBannerBackground_ColorId;
+    }
+    fillRect_Paint(p, rect, bg);
+    return fg;
+}
+
+static int sideElementAvailWidth_DocumentView_(const iDocumentView *d) {
+    return left_Rect(documentBounds_DocumentView_(d)) -
+           left_Rect(bounds_Widget(constAs_Widget(d->owner))) - 2 * d->pageMargin * gap_UI;
+}
+
+static iBool isSideHeadingVisible_DocumentView_(const iDocumentView *d) {
+    return sideElementAvailWidth_DocumentView_(d) >= lineHeight_Text(banner_FontId) * 4.5f;
+}
+
+static void updateSideIconBuf_DocumentView_(const iDocumentView *d) {
+    if (!isExposed_Window(get_Window())) {
+        return;
+    }
+    iDrawBufs *dbuf = d->drawBufs;
+    dbuf->flags &= ~updateSideBuf_DrawBufsFlag;
+    if (dbuf->sideIconBuf) {
+        SDL_DestroyTexture(dbuf->sideIconBuf);
+        dbuf->sideIconBuf = NULL;
+    }
+    //    const iGmRun *banner = siteBanner_GmDocument(d->doc);
+    if (isEmpty_Banner(d->owner->banner)) {
+        return;
+    }
+    const int   margin           = gap_UI * d->pageMargin;
+    const int   minBannerSize    = lineHeight_Text(banner_FontId) * 2;
+    const iChar icon             = siteIcon_GmDocument(d->doc);
+    const int   avail            = sideElementAvailWidth_DocumentView_(d) - margin;
+    iBool       isHeadingVisible = isSideHeadingVisible_DocumentView_(d);
+    /* Determine the required size. */
+    iInt2 bufSize = init1_I2(minBannerSize);
+    const int sideHeadingFont = FONT_ID(documentHeading_FontId, regular_FontStyle, contentBig_FontSize);
+    if (isHeadingVisible) {
+        const iInt2 headingSize = measureWrapRange_Text(sideHeadingFont, avail,
+                                                        currentHeading_DocumentView_(d)).bounds.size;
+        if (headingSize.x > 0) {
+            bufSize.y += gap_Text + headingSize.y;
+            bufSize.x = iMax(bufSize.x, headingSize.x);
+        }
+        else {
+            isHeadingVisible = iFalse;
+        }
+    }
+    SDL_Renderer *render = renderer_Window(get_Window());
+    dbuf->sideIconBuf = SDL_CreateTexture(render,
+                                          SDL_PIXELFORMAT_RGBA4444,
+                                          SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
+                                          bufSize.x, bufSize.y);
+    iPaint p;
+    init_Paint(&p);
+    beginTarget_Paint(&p, dbuf->sideIconBuf);
+    const iColor back = get_Color(tmBannerSideTitle_ColorId);
+    SDL_SetRenderDrawColor(render, back.r, back.g, back.b, 0); /* better blending of the edge */
+    SDL_RenderClear(render);
+    const iRect iconRect = { zero_I2(), init1_I2(minBannerSize) };
+    int fg = drawSideRect_(&p, iconRect);
+    iString str;
+    initUnicodeN_String(&str, &icon, 1);
+    drawCentered_Text(banner_FontId, iconRect, iTrue, fg, "%s", cstr_String(&str));
+    deinit_String(&str);
+    if (isHeadingVisible) {
+        iRangecc    text = currentHeading_DocumentView_(d);
+        iInt2       pos  = addY_I2(bottomLeft_Rect(iconRect), gap_Text);
+        const int   font = sideHeadingFont;
+        drawWrapRange_Text(font, pos, avail, tmBannerSideTitle_ColorId, text);
+    }
+    endTarget_Paint(&p);
+    SDL_SetTextureBlendMode(dbuf->sideIconBuf, SDL_BLENDMODE_BLEND);
+}
+
+static void drawSideElements_DocumentView_(const iDocumentView *d) {
+    const iWidget *w         = constAs_Widget(d->owner);
+    const iRect    bounds    = bounds_Widget(w);
+    const iRect    docBounds = documentBounds_DocumentView_(d);
+    const int      margin    = gap_UI * d->pageMargin;
+    float          opacity   = value_Anim(&d->sideOpacity);
+    const int      avail     = left_Rect(docBounds) - left_Rect(bounds) - 2 * margin;
+    iDrawBufs *    dbuf      = d->drawBufs;
+    iPaint         p;
+    init_Paint(&p);
+    setClip_Paint(&p, boundsWithoutVisualOffset_Widget(w));
+    /* Side icon and current heading. */
+    if (prefs_App()->sideIcon && opacity > 0 && dbuf->sideIconBuf) {
+        const iInt2 texSize = size_SDLTexture(dbuf->sideIconBuf);
+        if (avail > texSize.x) {
+            const int minBannerSize = lineHeight_Text(banner_FontId) * 2;
+            iInt2 pos = addY_I2(add_I2(topLeft_Rect(bounds), init_I2(margin, 0)),
+                                height_Rect(bounds) / 2 - minBannerSize / 2 -
+                                    (texSize.y > minBannerSize
+                                                       ? (gap_Text + lineHeight_Text(heading3_FontId)) / 2
+                                                       : 0));
+            SDL_SetTextureAlphaMod(dbuf->sideIconBuf, 255 * opacity);
+            SDL_RenderCopy(renderer_Window(get_Window()),
+                           dbuf->sideIconBuf, NULL,
+                           &(SDL_Rect){ pos.x, pos.y, texSize.x, texSize.y });
+        }
+    }
+    /* Reception timestamp. */
+    if (dbuf->timestampBuf && dbuf->timestampBuf->size.x <= avail) {
+        draw_TextBuf(
+            dbuf->timestampBuf,
+            add_I2(
+                bottomLeft_Rect(bounds),
+                init_I2(margin,
+                        -margin + -dbuf->timestampBuf->size.y +
+                            iMax(0, d->scrollY.max - pos_SmoothScroll(&d->scrollY)))),
+            tmQuoteIcon_ColorId);
+    }
+    unsetClip_Paint(&p);
+}
+
+static void drawMedia_DocumentView_(const iDocumentView *d, iPaint *p) {
+    iConstForEach(PtrArray, i, &d->visibleMedia) {
+        const iGmRun * run = i.ptr;
+        if (run->mediaType == audio_MediaType) {
+            iPlayerUI ui;
+            init_PlayerUI(&ui,
+                          audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(run)),
+                          runRect_DocumentView_(d, run));
+            draw_PlayerUI(&ui, p);
+        }
+        else if (run->mediaType == download_MediaType) {
+            iDownloadUI ui;
+            init_DownloadUI(&ui, constMedia_GmDocument(d->doc), run->mediaId,
+                            runRect_DocumentView_(d, run));
+            draw_DownloadUI(&ui, p);
+        }
+    }
+}
+
+static void extend_GmRunRange_(iGmRunRange *runs) {
+    if (runs->start) {
+        runs->start--;
+        runs->end++;
+    }
+}
+
+static iBool render_DocumentView_(const iDocumentView *d, iDrawContext *ctx, iBool prerenderExtra) {
+    iBool       didDraw = iFalse;
+    const iRect bounds  = bounds_Widget(constAs_Widget(d->owner));
+    const iRect ctxWidgetBounds =
+        init_Rect(0,
+                  0,
+                  width_Rect(bounds) - constAs_Widget(d->owner->scroll)->rect.size.x,
+                  height_Rect(bounds));
+    const iRangei full          = { 0, size_GmDocument(d->doc).y };
+    const iRangei vis           = ctx->vis;
+    iVisBuf      *visBuf        = d->visBuf; /* will be updated now */
+    d->drawBufs->lastRenderTime = SDL_GetTicks();
+    /* Swap buffers around to have room available both before and after the visible region. */
+    allocVisBuffer_DocumentView_(d);
+    reposition_VisBuf(visBuf, vis);
+    /* Redraw the invalid ranges. */
+    if (~flags_Widget(constAs_Widget(d->owner)) & destroyPending_WidgetFlag) {
+        iPaint *p = &ctx->paint;
+        init_Paint(p);
+        iForIndices(i, visBuf->buffers) {
+            iVisBufTexture *buf         = &visBuf->buffers[i];
+            iVisBufMeta    *meta        = buf->user;
+            const iRangei   bufRange    = intersect_Rangei(bufferRange_VisBuf(visBuf, i), full);
+            const iRangei   bufVisRange = intersect_Rangei(bufRange, vis);
+            ctx->widgetBounds = moved_Rect(ctxWidgetBounds, init_I2(0, -buf->origin));
+            ctx->viewPos      = init_I2(left_Rect(ctx->docBounds) - left_Rect(bounds), -buf->origin);
+            //            printf("  buffer %zu: buf vis range %d...%d\n", i, bufVisRange.start, bufVisRange.end);
+            if (!prerenderExtra && !isEmpty_Range(&bufVisRange)) {
+                didDraw = iTrue;
+                if (isEmpty_Rangei(buf->validRange)) {
+                    /* Fill the required currently visible range (vis). */
+                    const iRangei bufVisRange = intersect_Rangei(bufRange, vis);
+                    if (!isEmpty_Range(&bufVisRange)) {
+                        beginTarget_Paint(p, buf->texture);
+                        fillRect_Paint(p, (iRect){ zero_I2(), visBuf->texSize }, tmBackground_ColorId);
+                        iZap(ctx->runsDrawn);
+                        render_GmDocument(d->doc, bufVisRange, drawRun_DrawContext_, ctx);
+                        meta->runsDrawn = ctx->runsDrawn;
+                        extend_GmRunRange_(&meta->runsDrawn);
+                        buf->validRange = bufVisRange;
+                        //                printf("  buffer %zu valid %d...%d\n", i, bufRange.start, bufRange.end);
+                    }
+                }
+                else {
+                    /* Progressively fill the required runs. */
+                    if (meta->runsDrawn.start) {
+                        beginTarget_Paint(p, buf->texture);
+                        meta->runsDrawn.start = renderProgressive_GmDocument(d->doc, meta->runsDrawn.start,
+                                                                             -1, iInvalidSize,
+                                                                             bufVisRange,
+                                                                             drawRun_DrawContext_,
+                                                                             ctx);
+                        buf->validRange.start = bufVisRange.start;
+                    }
+                    if (meta->runsDrawn.end) {
+                        beginTarget_Paint(p, buf->texture);
+                        meta->runsDrawn.end = renderProgressive_GmDocument(d->doc, meta->runsDrawn.end,
+                                                                           +1, iInvalidSize,
+                                                                           bufVisRange,
+                                                                           drawRun_DrawContext_,
+                                                                           ctx);
+                        buf->validRange.end = bufVisRange.end;
+                    }
+                }
+            }
+            /* Progressively draw the rest of the buffer if it isn't fully valid. */
+            if (prerenderExtra && !equal_Rangei(bufRange, buf->validRange)) {
+                const iGmRun *next;
+                //                printf("%zu: prerenderExtra (start:%p end:%p)\n", i, meta->runsDrawn.start, meta->runsDrawn.end);
+                if (meta->runsDrawn.start == NULL) {
+                    /* Haven't drawn anything yet in this buffer, so let's try seeding it. */
+                    const int rh = lineHeight_Text(paragraph_FontId);
+                    const int y = i >= iElemCount(visBuf->buffers) / 2 ? bufRange.start : (bufRange.end - rh);
+                    beginTarget_Paint(p, buf->texture);
+                    fillRect_Paint(p, (iRect){ zero_I2(), visBuf->texSize }, tmBackground_ColorId);
+                    buf->validRange = (iRangei){ y, y + rh };
+                    iZap(ctx->runsDrawn);
+                    render_GmDocument(d->doc, buf->validRange, drawRun_DrawContext_, ctx);
+                    meta->runsDrawn = ctx->runsDrawn;
+                    extend_GmRunRange_(&meta->runsDrawn);
+                    //                    printf("%zu: seeded, next %p:%p\n", i, meta->runsDrawn.start, meta->runsDrawn.end);
+                    didDraw = iTrue;
+                }
+                else {
+                    if (meta->runsDrawn.start) {
+                        const iRangei upper = intersect_Rangei(bufRange, (iRangei){ full.start, buf->validRange.start });
+                        if (upper.end > upper.start) {
+                            beginTarget_Paint(p, buf->texture);
+                            next = renderProgressive_GmDocument(d->doc, meta->runsDrawn.start,
+                                                                -1, 1, upper,
+                                                                drawRun_DrawContext_,
+                                                                ctx);
+                            if (next && meta->runsDrawn.start != next) {
+                                meta->runsDrawn.start = next;
+                                buf->validRange.start = bottom_Rect(next->visBounds);
+                                didDraw = iTrue;
+                            }
+                            else {
+                                buf->validRange.start = bufRange.start;
+                            }
+                        }
+                    }
+                    if (!didDraw && meta->runsDrawn.end) {
+                        const iRangei lower = intersect_Rangei(bufRange, (iRangei){ buf->validRange.end, full.end });
+                        if (lower.end > lower.start) {
+                            beginTarget_Paint(p, buf->texture);
+                            next = renderProgressive_GmDocument(d->doc, meta->runsDrawn.end,
+                                                                +1, 1, lower,
+                                                                drawRun_DrawContext_,
+                                                                ctx);
+                            if (next && meta->runsDrawn.end != next) {
+                                meta->runsDrawn.end = next;
+                                buf->validRange.end = top_Rect(next->visBounds);
+                                didDraw = iTrue;
+                            }
+                            else {
+                                buf->validRange.end = bufRange.end;
+                            }
+                        }
+                    }
+                }
+            }
+            /* Draw any invalidated runs that fall within this buffer. */
+            if (!prerenderExtra) {
+                const iRangei bufRange = { buf->origin, buf->origin + visBuf->texSize.y };
+                /* Clear full-width backgrounds first in case there are any dynamic elements. */ {
+                    iConstForEach(PtrSet, r, d->invalidRuns) {
+                        const iGmRun *run = *r.value;
+                        if (isOverlapping_Rangei(bufRange, ySpan_Rect(run->visBounds))) {
+                            beginTarget_Paint(p, buf->texture);
+                            fillRect_Paint(p,
+                                           init_Rect(0,
+                                                     run->visBounds.pos.y - buf->origin,
+                                                     visBuf->texSize.x,
+                                                     run->visBounds.size.y),
+                                           tmBackground_ColorId);
+                        }
+                    }
+                }
+                setAnsiFlags_Text(ansiEscapes_GmDocument(d->doc));
+                iConstForEach(PtrSet, r, d->invalidRuns) {
+                    const iGmRun *run = *r.value;
+                    if (isOverlapping_Rangei(bufRange, ySpan_Rect(run->visBounds))) {
+                        beginTarget_Paint(p, buf->texture);
+                        drawRun_DrawContext_(ctx, run);
+                    }
+                }
+                setAnsiFlags_Text(allowAll_AnsiFlag);
+            }
+            endTarget_Paint(p);
+            if (prerenderExtra && didDraw) {
+                /* Just a run at a time. */
+                break;
+            }
+        }
+        if (!prerenderExtra) {
+            clear_PtrSet(d->invalidRuns);
+        }
+    }
+    return didDraw;
+}
+
+static void draw_DocumentView_(const iDocumentView *d) {
+    const iWidget *w                   = constAs_Widget(d->owner);
+    const iRect    bounds              = bounds_Widget(w);
+    const iRect    boundsWithoutVisOff = boundsWithoutVisualOffset_Widget(w);
+    const iRect    clipBounds          = intersect_Rect(bounds, boundsWithoutVisOff);
+    /* Each document has its own palette, but the drawing routines rely on a global one.
+       As we're now drawing a document, ensure that the right palette is in effect.
+       Document theme colors can be used elsewhere, too, but first a document's palette
+       must be made global. */
+    makePaletteGlobal_GmDocument(d->doc);
+    if (d->drawBufs->flags & updateTimestampBuf_DrawBufsFlag) {
+        updateTimestampBuf_DocumentView_(d);
+    }
+    if (d->drawBufs->flags & updateSideBuf_DrawBufsFlag) {
+        updateSideIconBuf_DocumentView_(d);
+        }
+    const iRect   docBounds = documentBounds_DocumentView_(d);
+    const iRangei vis       = visibleRange_DocumentView_(d);
+    iDrawContext  ctx       = {
+                                .view            = d,
+                                .docBounds       = docBounds,
+                                .vis             = vis,
+                                .showLinkNumbers = (d->owner->flags & showLinkNumbers_DocumentWidgetFlag) != 0,
+                         };
+    init_Paint(&ctx.paint);
+    render_DocumentView_(d, &ctx, iFalse /* just the mandatory parts */);
+    iBanner    *banner           = d->owner->banner;
+    int         yTop             = docBounds.pos.y + viewPos_DocumentView_(d);
+    const iBool isDocEmpty       = size_GmDocument(d->doc).y == 0;
+    const iBool isTouchSelecting = (flags_Widget(w) & touchDrag_WidgetFlag) != 0;
+    if (!isDocEmpty || !isEmpty_Banner(banner)) {
+        const int docBgColor = isDocEmpty ? tmBannerBackground_ColorId : tmBackground_ColorId;
+        setClip_Paint(&ctx.paint, clipBounds);
+        if (!isDocEmpty) {
+            draw_VisBuf(d->visBuf, init_I2(bounds.pos.x, yTop), ySpan_Rect(bounds));
+        }
+        /* Text markers. */
+        if (!isEmpty_Range(&d->owner->foundMark) || !isEmpty_Range(&d->owner->selectMark)) {
+            SDL_Renderer *render = renderer_Window(get_Window());
+            ctx.firstMarkRect = zero_Rect();
+            ctx.lastMarkRect = zero_Rect();
+            SDL_SetRenderDrawBlendMode(render,
+                                       isDark_ColorTheme(colorTheme_App()) ? SDL_BLENDMODE_ADD
+                                                                           : SDL_BLENDMODE_BLEND);
+            ctx.viewPos = topLeft_Rect(docBounds);
+            /* Marker starting outside the visible range? */
+            if (d->visibleRuns.start) {
+                if (!isEmpty_Range(&d->owner->selectMark) &&
+                    d->owner->selectMark.start < d->visibleRuns.start->text.start &&
+                    d->owner->selectMark.end > d->visibleRuns.start->text.start) {
+                    ctx.inSelectMark = iTrue;
+                }
+                if (isEmpty_Range(&d->owner->foundMark) &&
+                    d->owner->foundMark.start < d->visibleRuns.start->text.start &&
+                    d->owner->foundMark.end > d->visibleRuns.start->text.start) {
+                    ctx.inFoundMark = iTrue;
+                }
+            }
+            render_GmDocument(d->doc, vis, drawMark_DrawContext_, &ctx);
+            SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_NONE);
+            /* Selection range pins. */
+            if (isTouchSelecting) {
+                drawPin_Paint(&ctx.paint, ctx.firstMarkRect, 0, tmQuote_ColorId);
+                drawPin_Paint(&ctx.paint, ctx.lastMarkRect,  1, tmQuote_ColorId);
+            }
+        }
+        drawMedia_DocumentView_(d, &ctx.paint);
+        /* Fill the top and bottom, in case the document is short. */
+        if (yTop > top_Rect(bounds)) {
+            fillRect_Paint(&ctx.paint,
+                           (iRect){ bounds.pos, init_I2(bounds.size.x, yTop - top_Rect(bounds)) },
+                           !isEmpty_Banner(banner) ? tmBannerBackground_ColorId
+                                                   : docBgColor);
+        }
+        /* Banner. */
+        if (!isDocEmpty || numItems_Banner(banner) > 0) {
+            /* Fill the part between the banner and the top of the document. */
+            fillRect_Paint(&ctx.paint,
+                           (iRect){ init_I2(left_Rect(bounds),
+                                            top_Rect(docBounds) + viewPos_DocumentView_(d) -
+                                                documentTopPad_DocumentView_(d)),
+                                    init_I2(bounds.size.x, documentTopPad_DocumentView_(d)) },
+                           docBgColor);
+            setPos_Banner(banner, addY_I2(topLeft_Rect(docBounds),
+                                          -pos_SmoothScroll(&d->scrollY)));
+            draw_Banner(banner);
+        }
+        const int yBottom = yTop + size_GmDocument(d->doc).y;
+        if (yBottom < bottom_Rect(bounds)) {
+            fillRect_Paint(&ctx.paint,
+                           init_Rect(bounds.pos.x, yBottom, bounds.size.x, bottom_Rect(bounds) - yBottom),
+                           !isDocEmpty ? docBgColor : tmBannerBackground_ColorId);
+        }
+        unsetClip_Paint(&ctx.paint);
+        drawSideElements_DocumentView_(d);
+        /* Alt text. */
+        const float altTextOpacity = value_Anim(&d->altTextOpacity) * 6 - 5;
+        if (d->hoverAltPre && altTextOpacity > 0) {
+            const iGmPreMeta *meta = preMeta_GmDocument(d->doc, preId_GmRun(d->hoverAltPre));
+            if (meta->flags & topLeft_GmPreMetaFlag && ~meta->flags & decoration_GmRunFlag &&
+                !isEmpty_Range(&meta->altText)) {
+                const int   margin   = 3 * gap_UI / 2;
+                const int   altFont  = uiLabel_FontId;
+                const int   wrap     = docBounds.size.x - 2 * margin;
+                iInt2 pos            = addY_I2(add_I2(docBounds.pos, meta->pixelRect.pos),
+                                    viewPos_DocumentView_(d));
+                const iInt2 textSize = measureWrapRange_Text(altFont, wrap, meta->altText).bounds.size;
+                pos.y -= textSize.y + gap_UI;
+                pos.y               = iMax(pos.y, top_Rect(bounds));
+                const iRect altRect = { pos, init_I2(docBounds.size.x, textSize.y) };
+                ctx.paint.alpha     = altTextOpacity * 255;
+                if (altTextOpacity < 1) {
+                    SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
+                }
+                fillRect_Paint(&ctx.paint, altRect, tmBackgroundAltText_ColorId);
+                drawRect_Paint(&ctx.paint, altRect, tmFrameAltText_ColorId);
+                setOpacity_Text(altTextOpacity);
+                drawWrapRange_Text(altFont, addX_I2(pos, margin), wrap,
+                                   tmQuote_ColorId, meta->altText);
+                SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
+                setOpacity_Text(1.0f);
+            }
+        }
+        /* Touch selection indicator. */
+        if (isTouchSelecting) {
+            iRect rect = { topLeft_Rect(bounds),
+                           init_I2(width_Rect(bounds), lineHeight_Text(uiLabelBold_FontId)) };
+            fillRect_Paint(&ctx.paint, rect, uiTextAction_ColorId);
+            const iRangecc mark = selectMark_DocumentWidget_(d->owner);
+            drawCentered_Text(uiLabelBold_FontId,
+                              rect,
+                              iFalse,
+                              uiBackground_ColorId,
+                              "%zu bytes selected", /* TODO: i18n */
+                              size_Range(&mark));
+        }
+    }
+}
+
+/*----------------------------------------------------------------------------------------------*/
+
+static void enableActions_DocumentWidget_(iDocumentWidget *d, iBool enable) {
+    /* Actions are invisible child widgets of the DocumentWidget. */
+    iForEach(ObjectList, i, children_Widget(d)) {
+        if (isAction_Widget(i.object)) {
+            setFlags_Widget(i.object, disabled_WidgetFlag, !enable);
+        }
+    }
+}
+
+static void setLinkNumberMode_DocumentWidget_(iDocumentWidget *d, iBool set) {
+    if (((d->flags & showLinkNumbers_DocumentWidgetFlag) != 0) != set) {
+        iChangeFlags(d->flags, showLinkNumbers_DocumentWidgetFlag, set);
+        /* Children have priority when handling events. */
+        enableActions_DocumentWidget_(d, !set);
+#if defined (iPlatformAppleDesktop)
+        enableMenuItemsOnHomeRow_MacOS(!set);
+#endif
+        /* Ensure all keyboard events come here first. */
+        setKeyboardGrab_Widget(set ? as_Widget(d) : NULL);
+        if (d->menu) {
+            setFlags_Widget(d->menu, disabled_WidgetFlag, set);
+        }
+    }
+}
+
+static void requestUpdated_DocumentWidget_(iAnyObject *obj) {
+    iDocumentWidget *d = obj;
+    const int wasUpdated = exchange_Atomic(&d->isRequestUpdated, iTrue);
+    if (!wasUpdated) {
+        postCommand_Widget(obj,
+                           "document.request.updated doc:%p reqid:%u request:%p",
+                           d,
+                           id_GmRequest(d->request),
+                           d->request);
+    }
+}
+
+static void requestFinished_DocumentWidget_(iAnyObject *obj) {
+    iDocumentWidget *d = obj;
+    postCommand_Widget(obj,
+                       "document.request.finished doc:%p reqid:%u request:%p",
+                       d,
+                       id_GmRequest(d->request),
+                       d->request);
+}
+
+static void animate_DocumentWidget_(void *ticker) {
+    iDocumentWidget *d = ticker;
+    iAssert(isInstance_Object(d, &Class_DocumentWidget));
+    refresh_Widget(d);
+    if (!isFinished_Anim(&d->view.sideOpacity) || !isFinished_Anim(&d->view.altTextOpacity) ||
+        (d->linkInfo && !isFinished_Anim(&d->linkInfo->opacity))) {
+        addTicker_App(animate_DocumentWidget_, d);
+    }
 }
 
 static uint32_t mediaUpdateInterval_DocumentWidget_(const iDocumentWidget *d) {
@@ -819,10 +1993,10 @@ static uint32_t mediaUpdateInterval_DocumentWidget_(const iDocumentWidget *d) {
     }
     static const uint32_t invalidInterval_ = ~0u;
     uint32_t interval = invalidInterval_;
-    iConstForEach(PtrArray, i, &d->visibleMedia) {
+    iConstForEach(PtrArray, i, &d->view.visibleMedia) {
         const iGmRun *run = i.ptr;
         if (run->mediaType == audio_MediaType) {
-            iPlayer *plr = audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(run));
+            iPlayer *plr = audioPlayer_Media(media_GmDocument(d->view.doc), mediaId_GmRun(run));
             if (flags_Player(plr) & adjustingVolume_PlayerFlag ||
                 (isStarted_Player(plr) && !isPaused_Player(plr))) {
                 interval = iMin(interval, 1000 / 15);
@@ -845,10 +2019,10 @@ static uint32_t postMediaUpdate_DocumentWidget_(uint32_t interval, void *context
 static void updateMedia_DocumentWidget_(iDocumentWidget *d) {
     if (document_App() == d) {
         refresh_Widget(d);
-        iConstForEach(PtrArray, i, &d->visibleMedia) {
+        iConstForEach(PtrArray, i, &d->view.visibleMedia) {
             const iGmRun *run = i.ptr;
             if (run->mediaType == audio_MediaType) {
-                iPlayer *plr = audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(run));
+                iPlayer *plr = audioPlayer_Media(media_GmDocument(d->view.doc), mediaId_GmRun(run));
                 if (idleTimeMs_Player(plr) > 3000 && ~flags_Player(plr) & volumeGrabbed_PlayerFlag &&
                     flags_Player(plr) & adjustingVolume_PlayerFlag) {
                     setFlags_Player(plr, adjustingVolume_PlayerFlag, iFalse);
@@ -876,88 +2050,6 @@ static void animateMedia_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
-static iRangecc currentHeading_DocumentWidget_(const iDocumentWidget *d) {
-    iRangecc heading = iNullRange;
-    if (d->visibleRuns.start) {
-        iConstForEach(Array, i, headings_GmDocument(d->doc)) {
-            const iGmHeading *head = i.value;
-            if (head->level == 0) {
-                if (head->text.start <= d->visibleRuns.start->text.start) {
-                    heading = head->text;
-                }
-                if (d->visibleRuns.end && head->text.start > d->visibleRuns.end->text.start) {
-                    break;
-                }
-            }
-        }
-    }
-    return heading;
-}
-
-static int updateScrollMax_DocumentWidget_(iDocumentWidget *d) {
-    arrange_Widget(d->footerButtons); /* scrollMax depends on footer height */
-    const int scrollMax = scrollMax_DocumentWidget_(d);
-    setMax_SmoothScroll(&d->scrollY, scrollMax);
-    return scrollMax;
-}
-
-static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
-    iChangeFlags(d->flags,
-                 centerVertically_DocumentWidgetFlag,
-                 prefs_App()->centerShortDocs || startsWithCase_String(d->mod.url, "about:") ||
-                     !isSuccess_GmStatusCode(d->sourceStatus));
-    const iRangei visRange  = visibleRange_DocumentWidget_(d);
-//    printf("visRange: %d...%d\n", visRange.start, visRange.end);
-    const iRect   bounds    = bounds_Widget(as_Widget(d));
-    const int     scrollMax = updateScrollMax_DocumentWidget_(d);
-    /* Reposition the footer buttons as appropriate. */
-    /* TODO: You can just position `footerButtons` here completely without having to get
-       `Widget` involved with the offset in any way. */
-    setRange_ScrollWidget(d->scroll, (iRangei){ 0, scrollMax });
-    const int docSize = pageHeight_DocumentWidget_(d) + iMax(height_Widget(d->phoneToolbar),
-                                                             height_Widget(d->footerButtons));
-    const float scrollPos = pos_SmoothScroll(&d->scrollY);
-    setThumb_ScrollWidget(d->scroll,
-                          pos_SmoothScroll(&d->scrollY),
-                          docSize > 0 ? height_Rect(bounds) * size_Range(&visRange) / docSize : 0);
-    if (d->footerButtons) {
-        const iRect bounds    = bounds_Widget(as_Widget(d));
-        const iRect docBounds = documentBounds_DocumentWidget_(d);
-        const int   hPad      = (width_Rect(bounds) - iMin(120 * gap_UI, width_Rect(docBounds))) / 2;
-        const int   vPad      = 3 * gap_UI;
-        setPadding_Widget(d->footerButtons, hPad, 0, hPad, vPad);
-        d->footerButtons->rect.pos.y = height_Rect(bounds) - height_Widget(d->footerButtons) +
-                                       (scrollMax > 0 ? scrollMax - scrollPos : 0);
-    }
-    clear_PtrArray(&d->visibleLinks);
-    clear_PtrArray(&d->visibleWideRuns);
-    clear_PtrArray(&d->visiblePre);
-    clear_PtrArray(&d->visibleMedia);
-    const iRangecc oldHeading = currentHeading_DocumentWidget_(d);
-    /* Scan for visible runs. */ {
-        iZap(d->visibleRuns);
-        render_GmDocument(d->doc, visRange, addVisible_DocumentWidget_, d);
-    }
-    const iRangecc newHeading = currentHeading_DocumentWidget_(d);
-    if (memcmp(&oldHeading, &newHeading, sizeof(oldHeading))) {
-        d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
-    }
-    updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), 0));
-    updateSideOpacity_DocumentWidget_(d, iTrue);
-    animateMedia_DocumentWidget_(d);
-    /* Remember scroll positions of recently visited pages. */ {
-        iRecentUrl *recent = mostRecentUrl_History(d->mod.history);
-        if (recent && docSize && d->state == ready_RequestState) {
-            recent->normScrollY = normScrollPos_DocumentWidget_(d);
-        }
-    }
-    /* After scrolling/resizing stops, begin pre-rendering the visbuf contents. */ {
-        removeTicker_App(prerender_DocumentWidget_, d);
-        remove_Periodic(periodic_App(), d);
-        add_Periodic(periodic_App(), d, "document.render");
-    }
-}
-
 static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
     iLabelWidget *tabButton = tabPageButton_Widget(findChild_Widget(root_Widget(constAs_Widget(d)),
                                                                     "doctabs"), d);
@@ -966,8 +2058,8 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
         return;
     }
     iStringArray *title = iClob(new_StringArray());
-    if (!isEmpty_String(title_GmDocument(d->doc))) {
-        pushBack_StringArray(title, title_GmDocument(d->doc));
+    if (!isEmpty_String(title_GmDocument(d->view.doc))) {
+        pushBack_StringArray(title, title_GmDocument(d->view.doc));
     }
     if (!isEmpty_String(d->titleUser)) {
         pushBack_StringArray(title, d->titleUser);
@@ -998,7 +2090,7 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
             setTitle_MainWindow(get_MainWindow(), text);
             setWindow = iFalse;
         }
-        const iChar siteIcon = siteIcon_GmDocument(d->doc);
+        const iChar siteIcon = siteIcon_GmDocument(d->view.doc);
         if (siteIcon) {
             if (!isEmpty_String(text)) {
                 prependCStr_String(text, "  " restore_ColorEscape);
@@ -1038,50 +2130,28 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
     }
 }
 
-static void updateTimestampBuf_DocumentWidget_(const iDocumentWidget *d) {
-    if (!isExposed_Window(get_Window())) {
+static void invalidate_DocumentWidget_(iDocumentWidget *d) {
+    if (flags_Widget(as_Widget(d)) & destroyPending_WidgetFlag) {
         return;
     }
-    if (d->drawBufs->timestampBuf) {
-        delete_TextBuf(d->drawBufs->timestampBuf);
-        d->drawBufs->timestampBuf = NULL;
-    }
-    if (isValid_Time(&d->sourceTime)) {
-        iString *fmt = timeFormatHourPreference_Lang("page.timestamp");
-        d->drawBufs->timestampBuf = newRange_TextBuf(
-            uiLabel_FontId,
-            white_ColorId,
-            range_String(collect_String(format_Time(&d->sourceTime, cstr_String(fmt)))));
-        delete_String(fmt);
+    if (d->flags & invalidationPending_DocumentWidgetFlag) {
+        return;
     }
-    d->drawBufs->flags &= ~updateTimestampBuf_DrawBufsFlag;
-}
-
-static void invalidate_DocumentWidget_(iDocumentWidget *d) {
-    if (flags_Widget(as_Widget(d)) & destroyPending_WidgetFlag) {
+    if (isAffectedByVisualOffset_Widget(as_Widget(d))) {
+        d->flags |= invalidationPending_DocumentWidgetFlag;
         return;
     }
-    invalidate_VisBuf(d->visBuf);
-    clear_PtrSet(d->invalidRuns);
+    d->flags &= ~invalidationPending_DocumentWidgetFlag;
+    invalidate_DocumentView_(&d->view);
+//    printf("[%p] '%s' invalidated\n", d, cstr_String(id_Widget(as_Widget(d))));
 }
 
 static iRangecc siteText_DocumentWidget_(const iDocumentWidget *d) {
-    return isEmpty_String(d->titleUser) ? urlHost_String(d->mod.url) 
+    return isEmpty_String(d->titleUser) ? urlHost_String(d->mod.url)
                                         : range_String(d->titleUser);
 }
 
-static void documentRunsInvalidated_DocumentWidget_(iDocumentWidget *d) {
-    d->foundMark   = iNullRange;
-    d->selectMark  = iNullRange;
-    d->hoverPre    = NULL;
-    d->hoverAltPre = NULL;
-    d->hoverLink   = NULL;
-    d->contextLink = NULL;
-    iZap(d->visibleRuns);
-    iZap(d->renderRuns);
-}
-
-iBool isPinned_DocumentWidget_(const iDocumentWidget *d) {
+static iBool isPinned_DocumentWidget_(const iDocumentWidget *d) {
     if (deviceType_App() == phone_AppDeviceType) {
         return iFalse;
     }
@@ -1104,12 +2174,20 @@ static void showOrHidePinningIndicator_DocumentWidget_(iDocumentWidget *d) {
                          isPinned_DocumentWidget_(d));
 }
 
+static void updateBanner_DocumentWidget_(iDocumentWidget *d) {
+    setSite_Banner(d->banner, siteText_DocumentWidget_(d), siteIcon_GmDocument(d->view.doc));
+}
+
 static void documentWasChanged_DocumentWidget_(iDocumentWidget *d) {
-    updateVisitedLinks_GmDocument(d->doc);
+    iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iFalse);
+    setFlags_Widget(as_Widget(d), touchDrag_WidgetFlag, iFalse);
+    d->requestLinkId = 0;
+    updateVisitedLinks_GmDocument(d->view.doc);
     documentRunsInvalidated_DocumentWidget_(d);
     updateWindowTitle_DocumentWidget_(d);
-    updateVisible_DocumentWidget_(d);
-    d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
+    updateBanner_DocumentWidget_(d);
+    updateVisible_DocumentView_(&d->view);
+    d->view.drawBufs->flags |= updateSideBuf_DrawBufsFlag;
     invalidate_DocumentWidget_(d);
     refresh_Widget(as_Widget(d));
     /* Check for special bookmark tags. */
@@ -1117,59 +2195,28 @@ static void documentWasChanged_DocumentWidget_(iDocumentWidget *d) {
     const uint16_t bmid = findUrl_Bookmarks(bookmarks_App(), d->mod.url);
     if (bmid) {
         const iBookmark *bm = get_Bookmarks(bookmarks_App(), bmid);
-        if (hasTag_Bookmark(bm, linkSplit_BookmarkTag)) {
+        if (bm->flags & linkSplit_BookmarkFlag) {
             d->flags |= otherRootByDefault_DocumentWidgetFlag;
         }
     }
     showOrHidePinningIndicator_DocumentWidget_(d);
-    setCachedDocument_History(d->mod.history,
-                              d->doc, /* keeps a ref */
-                              (d->flags & openedFromSidebar_DocumentWidgetFlag) != 0);
-}
-
-void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
-    setUrl_GmDocument(d->doc, d->mod.url);
-    const int docWidth = documentWidth_DocumentWidget_(d);
-    setSource_GmDocument(d->doc,
-                         source,
-                         docWidth,
-                         width_Widget(d),
-                         isFinished_GmRequest(d->request) ? final_GmDocumentUpdate
-                                                          : partial_GmDocumentUpdate);
-    setWidth_Banner(d->banner, docWidth);
-    documentWasChanged_DocumentWidget_(d);
+    if (~d->flags & fromCache_DocumentWidgetFlag) {
+        setCachedDocument_History(d->mod.history, d->view.doc /* keeps a ref */);
+    }
 }
 
 static void replaceDocument_DocumentWidget_(iDocumentWidget *d, iGmDocument *newDoc) {
-    pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
-    iRelease(d->doc);
-    d->doc = ref_Object(newDoc);
+    pauseAllPlayers_Media(media_GmDocument(d->view.doc), iTrue);
+    iRelease(d->view.doc);
+    d->view.doc = ref_Object(newDoc);
     documentWasChanged_DocumentWidget_(d);
 }
 
-static void updateBanner_DocumentWidget_(iDocumentWidget *d) {
-    /* TODO: Set width. */
-    setSite_Banner(d->banner, siteText_DocumentWidget_(d), siteIcon_GmDocument(d->doc));
-}
-
 static void updateTheme_DocumentWidget_(iDocumentWidget *d) {
     if (document_App() != d || category_GmStatusCode(d->sourceStatus) == categoryInput_GmStatusCode) {
         return;
     }
-    if (equalCase_Rangecc(urlScheme_String(d->mod.url), "file")) {
-        iBlock empty;
-        init_Block(&empty, 0);
-        setThemeSeed_GmDocument(d->doc, &empty);
-        deinit_Block(&empty);
-    }
-    else if (isEmpty_String(d->titleUser)) {
-        setThemeSeed_GmDocument(d->doc,
-                                collect_Block(newRange_Block(urlHost_String(d->mod.url))));
-    }
-    else {
-        setThemeSeed_GmDocument(d->doc, &d->titleUser->chars);
-    }
-    d->drawBufs->flags |= updateTimestampBuf_DrawBufsFlag;
+    d->view.drawBufs->flags |= updateTimestampBuf_DrawBufsFlag;
     updateBanner_DocumentWidget_(d);
 }
 
@@ -1186,7 +2233,6 @@ static void makeFooterButtons_DocumentWidget_(iDocumentWidget *d, const iMenuIte
                         resizeWidthOfChildren_WidgetFlag | arrangeHeight_WidgetFlag |
                         fixedPosition_WidgetFlag | resizeToParentWidth_WidgetFlag,
                     iTrue);
-    //setBackgroundColor_Widget(d->footerButtons, tmBackground_ColorId);
     for (size_t i = 0; i < count; ++i) {
         iLabelWidget *button = addChildFlags_Widget(
             d->footerButtons,
@@ -1196,25 +2242,18 @@ static void makeFooterButtons_DocumentWidget_(iDocumentWidget *d, const iMenuIte
         setPadding1_Widget(as_Widget(button), gap_UI / 2);
         checkIcon_LabelWidget(button);
         setFont_LabelWidget(button, uiContent_FontId);
-    }
-    if (deviceType_App() == phone_AppDeviceType) {
-        /* Footer buttons shouldn't be under the toolbar. */
-        addChild_Widget(d->footerButtons, iClob(makePadding_Widget(height_Widget(d->phoneToolbar))));
+        setBackgroundColor_Widget(as_Widget(button), uiBackgroundSidebar_ColorId);
     }
     addChild_Widget(as_Widget(d), iClob(d->footerButtons));
     arrange_Widget(d->footerButtons);
     arrange_Widget(w);
-    updateVisible_DocumentWidget_(d); /* final placement for the buttons */
+    updateVisible_DocumentView_(&d->view); /* final placement for the buttons */
 }
 
 static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode code,
                                           const iString *meta) {
-    /* TODO: No such thing as an "error page". It should be an empty page with an error banner. */
-    iString *src = collectNew_String();
+    iString        *src = collectNew_String();
     const iGmError *msg = get_GmError(code);
-  //  appendChar_String(src, msg->icon ? msg->icon : 0x2327); /* X in a box */
-    //appendFormat_String(src, " %s\n%s", msg->title, msg->info);
-//    iBool useBanner = iTrue;
     destroy_Widget(d->footerButtons);
     d->footerButtons = NULL;
     const iString *serverErrorMsg = NULL;
@@ -1264,6 +2303,11 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                                       0,
                                       format_CStr("document.setmediatype mime:%s", mtype) });
                 }
+                pushBack_Array(&items,
+                               &(iMenuItem){ export_Icon " ${menu.open.external}",
+                                             SDLK_RETURN,
+                                             KMOD_PRIMARY,
+                                             "document.save extview:1" });
                 pushBack_Array(
                     &items,
                     &(iMenuItem){ translateCStr_Lang(download_Icon " " saveToDownloads_Label),
@@ -1285,12 +2329,18 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
     if (category_GmStatusCode(code) == categoryClientCertificate_GmStatus) {
         makeFooterButtons_DocumentWidget_(
             d,
-            (iMenuItem[]){ { leftHalf_Icon " ${menu.show.identities}", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" },
-                           { person_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" } },
+            (iMenuItem[]){
+                { leftHalf_Icon " ${menu.show.identities}",
+                  '4',
+                  KMOD_PRIMARY,
+                  deviceType_App() == desktop_AppDeviceType ? "sidebar.mode arg:3 show:1"
+                                                            : "preferences idents:1" },
+                { person_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" } },
             2);
     }
     /* Make a new document for the error page.*/
     iGmDocument *errorDoc = new_GmDocument();
+    setWidth_GmDocument(errorDoc, documentWidth_DocumentView_(&d->view), width_Widget(d));
     setUrl_GmDocument(errorDoc, d->mod.url);
     setFormat_GmDocument(errorDoc, gemini_SourceFormat);
     replaceDocument_DocumentWidget_(d, errorDoc);
@@ -1300,10 +2350,7 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
     d->state = ready_RequestState;
     setSource_DocumentWidget(d, src);
     updateTheme_DocumentWidget_(d);
-    reset_SmoothScroll(&d->scrollY);
-    init_Anim(&d->sideOpacity, 0);
-    init_Anim(&d->altTextOpacity, 0);
-    resetWideRuns_DocumentWidget_(d);
+    resetScroll_DocumentView_(&d->view);
 }
 
 static void updateFetchProgress_DocumentWidget_(iDocumentWidget *d) {
@@ -1419,9 +2466,9 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
                                          "document.save" } },
                         2);
                 }
-                if (preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
-                    redoLayout_GmDocument(d->doc);
-                    updateVisible_DocumentWidget_(d);
+                if (preloadCoverImage_Gempub(d->sourceGempub, d->view.doc)) {
+                    redoLayout_GmDocument(d->view.doc);
+                    updateVisible_DocumentView_(&d->view);
                     invalidate_DocumentWidget_(d);
                 }
             }
@@ -1497,7 +2544,7 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
                     }
                     else {
                         postCommandf_App(
-                            "open newtab:%d url:%s", otherRoot_OpenTabFlag, cstr_String(navStart));
+                            "open splitmode:1 newtab:%d url:%s", otherRoot_OpenTabFlag, cstr_String(navStart));
                     }
                 }
             }
@@ -1525,7 +2572,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
         }
         clear_String(&d->sourceMime);
         d->sourceTime = response->when;
-        d->drawBufs->flags |= updateTimestampBuf_DrawBufsFlag;
+        d->view.drawBufs->flags |= updateTimestampBuf_DrawBufsFlag;
         initBlock_String(&str, &response->body); /* Note: Body may be megabytes in size. */
         if (isSuccess_GmStatusCode(statusCode)) {
             /* Check the MIME type. */
@@ -1565,7 +2612,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                     setRange_String(&d->sourceMime, param);
                     format_String(&str, "# TrueType Font\n");
                     iString *decUrl      = collect_String(urlDecode_String(d->mod.url));
-                    iRangecc name        = baseName_Path(decUrl);
+                    iRangecc name        = baseNameSep_Path(decUrl, "/");
                     iBool    isInstalled = iFalse;
                     if (startsWith_String(collect_String(localFilePathFromUrl_String(d->mod.url)),
                                           cstr_String(dataDir_App()))) {
@@ -1628,7 +2675,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                         appendFormat_String(&str,
                                             cstr_Lang("doc.archive"),
                                             cstr_Rangecc(baseName_Path(d->mod.url)));
-                        appendCStr_String(&str, "\n");                        
+                        appendCStr_String(&str, "\n");
                     }
                     appendCStr_String(&str, "\n");
                     iString *localPath = localFilePathFromUrl_String(d->mod.url);
@@ -1669,16 +2716,16 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                         format_String(&str, "=> %s %s\n",
                                       cstr_String(canonicalUrl_String(d->mod.url)),
                                       linkTitle);
-                        setData_Media(media_GmDocument(d->doc),
+                        setData_Media(media_GmDocument(d->view.doc),
                                       imgLinkId,
                                       mimeStr,
                                       &response->body,
                                       !isRequestFinished ? partialData_MediaFlag : 0);
-                        redoLayout_GmDocument(d->doc);
+                        redoLayout_GmDocument(d->view.doc);
                     }
                     else if (isAudio && !isInitialUpdate) {
                         /* Update the audio content. */
-                        setData_Media(media_GmDocument(d->doc),
+                        setData_Media(media_GmDocument(d->view.doc),
                                       imgLinkId,
                                       mimeStr,
                                       &response->body,
@@ -1708,11 +2755,12 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                     return;
                 }
                 d->flags |= drawDownloadCounter_DocumentWidgetFlag;
-                clear_PtrSet(d->invalidRuns);
+                clear_PtrSet(d->view.invalidRuns);
+                documentRunsInvalidated_DocumentWidget_(d);
                 deinit_String(&str);
                 return;
             }
-            setFormat_GmDocument(d->doc, docFormat);
+            setFormat_GmDocument(d->view.doc, docFormat);
             /* Convert the source to UTF-8 if needed. */
             if (!equalCase_Rangecc(charset, "utf-8")) {
                 set_String(&str,
@@ -1721,7 +2769,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
         }
         if (cachedDoc) {
             replaceDocument_DocumentWidget_(d, cachedDoc);
-            updateWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d), width_Widget(d));
+            updateWidth_DocumentView_(&d->view);
         }
         else if (setSource) {
             setSource_DocumentWidget(d, &str);
@@ -1731,6 +2779,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
 }
 
 static void fetch_DocumentWidget_(iDocumentWidget *d) {
+    iAssert(~d->flags & animationPlaceholder_DocumentWidgetFlag);
     /* Forget the previous request. */
     if (d->request) {
         iRelease(d->request);
@@ -1740,8 +2789,6 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
                       "document.request.started doc:%p url:%s",
                       d,
                       cstr_String(d->mod.url));
-    clear_ObjectList(d->media);
-    d->certFlags = 0;
     setLinkNumberMode_DocumentWidget_(d, iFalse);
     d->flags &= ~drawDownloadCounter_DocumentWidgetFlag;
     d->state = fetching_RequestState;
@@ -1774,7 +2821,7 @@ static void updateTrust_DocumentWidget_(iDocumentWidget *d, const iGmResponse *r
     }
     else if (~d->certFlags & timeVerified_GmCertFlag) {
         updateTextCStr_LabelWidget(lock, isDarkMode ? orange_ColorEscape warning_Icon
-                                                    : black_ColorEscape warning_Icon);        
+                                                    : black_ColorEscape warning_Icon);
     }
     else {
         updateTextCStr_LabelWidget(lock, green_ColorEscape closedLock_Icon);
@@ -1793,17 +2840,24 @@ static void cacheRunGlyphs_(void *data, const iGmRun *run) {
 }
 
 static void cacheDocumentGlyphs_DocumentWidget_(const iDocumentWidget *d) {
-    if (isFinishedLaunching_App() && isExposed_Window(get_Window())) {
+    if (isFinishedLaunching_App() && isExposed_Window(get_Window()) &&
+        ~d->flags & animationPlaceholder_DocumentWidgetFlag) {
         /* Just cache the top of the document, since this is what we usually need. */
         int maxY = height_Widget(&d->widget) * 2;
         if (maxY == 0) {
-            maxY = size_GmDocument(d->doc).y;
+            maxY = size_GmDocument(d->view.doc).y;
         }
-        render_GmDocument(d->doc, (iRangei){ 0, maxY }, cacheRunGlyphs_, NULL);
+        render_GmDocument(d->view.doc, (iRangei){ 0, maxY }, cacheRunGlyphs_, NULL);
     }
 }
 
 static void addBannerWarnings_DocumentWidget_(iDocumentWidget *d) {
+    updateBanner_DocumentWidget_(d);
+    /* Warnings are not shown on internal pages. */
+    if (equalCase_Rangecc(urlScheme_String(d->mod.url), "about")) {
+        clear_Banner(d->banner);
+        return;
+    }
     /* Warnings related to certificates and trust. */
     const int certFlags = d->certFlags;
     const int req = timeVerified_GmCertFlag | domainVerified_GmCertFlag | trusted_GmCertFlag;
@@ -1850,7 +2904,7 @@ static void addBannerWarnings_DocumentWidget_(iDocumentWidget *d) {
         value_SiteSpec(collectNewRange_String(urlRoot_String(d->mod.url)),
                        dismissWarnings_SiteSpecKey) |
         (!prefs_App()->warnAboutMissingGlyphs ? missingGlyphs_GmDocumentWarning : 0);
-    const int warnings = warnings_GmDocument(d->doc) & ~dismissed;
+    const int warnings = warnings_GmDocument(d->view.doc) & ~dismissed;
     if (warnings & missingGlyphs_GmDocumentWarning) {
         add_Banner(d->banner, warning_BannerType, missingGlyphs_GmStatusCode, NULL, NULL);
         /* TODO: List one or more of the missing characters and/or their Unicode blocks? */
@@ -1862,17 +2916,18 @@ static void addBannerWarnings_DocumentWidget_(iDocumentWidget *d) {
 
 static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float normScrollY,
                                                      const iGmResponse *resp, iGmDocument *cachedDoc) {
+//    iAssert(width_Widget(d) > 0); /* must be laid out by now */
     setLinkNumberMode_DocumentWidget_(d, iFalse);
     clear_ObjectList(d->media);
     delete_Gempub(d->sourceGempub);
     d->sourceGempub = NULL;
-    pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
-    iRelease(d->doc);
+    pauseAllPlayers_Media(media_GmDocument(d->view.doc), iTrue);
     destroy_Widget(d->footerButtons);
     d->footerButtons = NULL;
-    d->doc = new_GmDocument();
-    resetWideRuns_DocumentWidget_(d);
+    iRelease(d->view.doc);
+    d->view.doc = new_GmDocument();
     d->state = fetching_RequestState;
+    d->flags |= fromCache_DocumentWidgetFlag;
     /* Do the fetch. */ {
         d->initNormScrollY = normScrollY;
         /* Use the cached response data. */
@@ -1881,36 +2936,37 @@ static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float n
         d->sourceStatus = success_GmStatusCode;
         format_String(&d->sourceHeader, cstr_Lang("pageinfo.header.cached"));
         set_Block(&d->sourceContent, &resp->body);
+        if (!cachedDoc) {
+            updateWidthAndRedoLayout_DocumentView_(&d->view);
+        }
         updateDocument_DocumentWidget_(d, resp, cachedDoc, iTrue);
-//        setCachedDocument_History(d->mod.history, d->doc,
-//                                  (d->flags & openedFromSidebar_DocumentWidgetFlag) != 0);
         clear_Banner(d->banner);
         updateBanner_DocumentWidget_(d);
         addBannerWarnings_DocumentWidget_(d);
     }
     d->state = ready_RequestState;
     postProcessRequestContent_DocumentWidget_(d, iTrue);
-    init_Anim(&d->altTextOpacity, 0);
-    reset_SmoothScroll(&d->scrollY);
-    init_Anim(&d->scrollY.pos, d->initNormScrollY * pageHeight_DocumentWidget_(d));
-    updateSideOpacity_DocumentWidget_(d, iFalse);
-    updateVisible_DocumentWidget_(d);
-    moveSpan_SmoothScroll(&d->scrollY, 0, 0); /* clamp position to new max */
+    resetScroll_DocumentView_(&d->view);
+    init_Anim(&d->view.scrollY.pos, d->initNormScrollY * pageHeight_DocumentView_(&d->view));
+    updateVisible_DocumentView_(&d->view);
+    moveSpan_SmoothScroll(&d->view.scrollY, 0, 0); /* clamp position to new max */
+    updateSideOpacity_DocumentView_(&d->view, iFalse);
     cacheDocumentGlyphs_DocumentWidget_(d);
-    d->drawBufs->flags |= updateTimestampBuf_DrawBufsFlag | updateSideBuf_DrawBufsFlag;
+    d->view.drawBufs->flags |= updateTimestampBuf_DrawBufsFlag | updateSideBuf_DrawBufsFlag;
     d->flags &= ~(urlChanged_DocumentWidgetFlag | drawDownloadCounter_DocumentWidgetFlag);
     postCommandf_Root(
         as_Widget(d)->root, "document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
 }
 
 static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
-    const iRecentUrl *recent = findUrl_History(d->mod.history, d->mod.url);
-    if (recent && recent->cachedResponse) {
-        iChangeFlags(d->flags,
-                     openedFromSidebar_DocumentWidgetFlag,
-                     recent->flags.openedFromSidebar);
+    const iRecentUrl *recent = constMostRecentUrl_History(d->mod.history);
+    if (recent && recent->cachedResponse && equalCase_String(&recent->url, d->mod.url)) {
         updateFromCachedResponse_DocumentWidget_(
             d, recent->normScrollY, recent->cachedResponse, recent->cachedDoc);
+        if (!recent->cachedDoc) {
+            /* We have a cached copy now. */
+            setCachedDocument_History(d->mod.history, d->view.doc);
+        }
         return iTrue;
     }
     else if (!isEmpty_String(d->mod.url)) {
@@ -1924,23 +2980,25 @@ static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
 }
 
 static void refreshWhileScrolling_DocumentWidget_(iAny *ptr) {
+    iAssert(isInstance_Object(ptr, &Class_DocumentWidget));
     iDocumentWidget *d = ptr;
-    updateVisible_DocumentWidget_(d);
+    iDocumentView *view = &d->view;
+    updateVisible_DocumentView_(view);
     refresh_Widget(d);
-    if (d->animWideRunId) {
-        for (const iGmRun *r = d->animWideRunRange.start; r != d->animWideRunRange.end; r++) {
-            insert_PtrSet(d->invalidRuns, r);
+    if (view->animWideRunId) {
+        for (const iGmRun *r = view->animWideRunRange.start; r != view->animWideRunRange.end; r++) {
+            insert_PtrSet(view->invalidRuns, r);
         }
     }
-    if (isFinished_Anim(&d->animWideRunOffset)) {
-        d->animWideRunId = 0;
+    if (isFinished_Anim(&view->animWideRunOffset)) {
+        view->animWideRunId = 0;
     }
-    if (!isFinished_SmoothScroll(&d->scrollY) || !isFinished_Anim(&d->animWideRunOffset)) {
+    if (!isFinished_SmoothScroll(&view->scrollY) || !isFinished_Anim(&view->animWideRunOffset)) {
         addTicker_App(refreshWhileScrolling_DocumentWidget_, d);
     }
-    if (isFinished_SmoothScroll(&d->scrollY)) {
+    if (isFinished_SmoothScroll(&view->scrollY)) {
         iChangeFlags(d->flags, noHoverWhileScrolling_DocumentWidgetFlag, iFalse);
-        updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), 0));
+        updateHover_DocumentView_(view, mouseCoord_Window(get_Window(), 0));
     }
 }
 
@@ -1949,16 +3007,16 @@ static void scrollBegan_DocumentWidget_(iAnyObject *any, int offset, uint32_t du
     /* Get rid of link numbers when scrolling. */
     if (offset && d->flags & showLinkNumbers_DocumentWidgetFlag) {
         setLinkNumberMode_DocumentWidget_(d, iFalse);
-        invalidateVisibleLinks_DocumentWidget_(d);
+        invalidateVisibleLinks_DocumentView_(&d->view);
     }
     /* Show and hide toolbar on scroll. */
     if (deviceType_App() == phone_AppDeviceType) {
-        const float normPos = normScrollPos_DocumentWidget_(d);
+        const float normPos = normScrollPos_DocumentView_(&d->view);
         if (prefs_App()->hideToolbarOnScroll && iAbs(offset) > 5 && normPos >= 0) {
             showToolbar_Root(as_Widget(d)->root, offset < 0);
         }
     }
-    updateVisible_DocumentWidget_(d);
+    updateVisible_DocumentView_(&d->view);
     refresh_Widget(as_Widget(d));
     if (duration > 0) {
         iChangeFlags(d->flags, noHoverWhileScrolling_DocumentWidgetFlag, iTrue);
@@ -1966,98 +3024,14 @@ static void scrollBegan_DocumentWidget_(iAnyObject *any, int offset, uint32_t du
     }
 }
 
-static void clampScroll_DocumentWidget_(iDocumentWidget *d) {
-    move_SmoothScroll(&d->scrollY, 0);
-}
-
-static void immediateScroll_DocumentWidget_(iDocumentWidget *d, int offset) {
-    move_SmoothScroll(&d->scrollY, offset);
-}
-
-static void smoothScroll_DocumentWidget_(iDocumentWidget *d, int offset, int duration) {
-    moveSpan_SmoothScroll(&d->scrollY, offset, duration);
-}
-
-static void scrollTo_DocumentWidget_(iDocumentWidget *d, int documentY, iBool centered) {
-    if (!isEmpty_Banner(d->banner)) {
-        documentY += height_Banner(d->banner) + documentTopPad_DocumentWidget_(d);
-    }
-    else {
-        documentY += documentTopPad_DocumentWidget_(d) + d->pageMargin * gap_UI;
-    }
-    init_Anim(&d->scrollY.pos,
-              documentY - (centered ? documentBounds_DocumentWidget_(d).size.y / 2
-                                    : lineHeight_Text(paragraph_FontId)));
-    clampScroll_DocumentWidget_(d);
-}
-
-static void scrollToHeading_DocumentWidget_(iDocumentWidget *d, const char *heading) {
-    iConstForEach(Array, h, headings_GmDocument(d->doc)) {
-        const iGmHeading *head = h.value;
-        if (startsWithCase_Rangecc(head->text, heading)) {
-            postCommandf_Root(as_Widget(d)->root, "document.goto loc:%p", head->text.start);
-            break;
-        }
-    }
-}
-
-static void scrollWideBlock_DocumentWidget_(iDocumentWidget *d, iInt2 mousePos, int delta,
-                                            int duration) {
-    if (delta == 0) {
-        return;
-    }
-    const iInt2 docPos = documentPos_DocumentWidget_(d, mousePos);
-    iConstForEach(PtrArray, i, &d->visibleWideRuns) {
-        const iGmRun *run = i.ptr;
-        if (docPos.y >= top_Rect(run->bounds) && docPos.y <= bottom_Rect(run->bounds)) {
-            /* We can scroll this run. First find out how much is allowed. */
-            const iGmRunRange range = findPreformattedRange_GmDocument(d->doc, run);
-            int maxWidth = 0;
-            for (const iGmRun *r = range.start; r != range.end; r++) {
-                maxWidth = iMax(maxWidth, width_Rect(r->visBounds));
-            }
-            const int maxOffset = maxWidth - documentWidth_DocumentWidget_(d) + d->pageMargin * gap_UI;
-            if (size_Array(&d->wideRunOffsets) <= preId_GmRun(run)) {
-                resize_Array(&d->wideRunOffsets, preId_GmRun(run) + 1);
-            }
-            int *offset = at_Array(&d->wideRunOffsets, preId_GmRun(run) - 1);
-            const int oldOffset = *offset;
-            *offset = iClamp(*offset + delta, 0, maxOffset);
-            /* Make sure the whole block gets redraw. */
-            if (oldOffset != *offset) {
-                for (const iGmRun *r = range.start; r != range.end; r++) {
-                    insert_PtrSet(d->invalidRuns, r);
-                }
-                refresh_Widget(d);
-                d->selectMark = iNullRange;
-                d->foundMark  = iNullRange;
-            }
-            if (duration) {
-                if (d->animWideRunId != preId_GmRun(run) || isFinished_Anim(&d->animWideRunOffset)) {
-                    d->animWideRunId = preId_GmRun(run);
-                    init_Anim(&d->animWideRunOffset, oldOffset);
-                }
-                setValueEased_Anim(&d->animWideRunOffset, *offset, duration);
-                d->animWideRunRange = range;
-                addTicker_App(refreshWhileScrolling_DocumentWidget_, d);
-            }
-            else {
-                d->animWideRunId = 0;
-                init_Anim(&d->animWideRunOffset, 0);
-            }
-            break;
-        }
-    }
-}
-
 static void togglePreFold_DocumentWidget_(iDocumentWidget *d, uint16_t preId) {
-    d->hoverPre    = NULL;
-    d->hoverAltPre = NULL;
-    d->selectMark  = iNullRange;
-    foldPre_GmDocument(d->doc, preId);
-    redoLayout_GmDocument(d->doc);
-    clampScroll_DocumentWidget_(d);
-    updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), 0));
+    d->view.hoverPre    = NULL;
+    d->view.hoverAltPre = NULL;
+    d->selectMark       = iNullRange;
+    foldPre_GmDocument(d->view.doc, preId);
+    redoLayout_GmDocument(d->view.doc);
+    clampScroll_DocumentView_(&d->view);
+    updateHover_DocumentView_(&d->view, mouseCoord_Window(get_Window(), 0));
     invalidate_DocumentWidget_(d);
     refresh_Widget(as_Widget(d));
 }
@@ -2071,7 +3045,15 @@ static iString *makeQueryUrl_DocumentWidget_(const iDocumentWidget *d,
         remove_Block(&url->chars, qPos, iInvalidSize);
     }
     appendCStr_String(url, "?");
-    append_String(url, collect_String(urlEncode_String(userEnteredText)));
+    iString *cleaned = copy_String(userEnteredText);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        trimEnd_String(cleaned); /* autocorrect may insert an extra space */
+        if (isEmpty_String(cleaned)) {
+            set_String(cleaned, userEnteredText); /* user wanted just spaces? */
+        }
+    }
+    append_String(url, collect_String(urlEncode_String(cleaned)));
+    delete_String(cleaned);
     return url;
 }
 
@@ -2107,6 +3089,14 @@ static const char *humanReadableStatusCode_(enum iGmStatusCode code) {
     return format_CStr("%d ", code);
 }
 
+static void setUrl_DocumentWidget_(iDocumentWidget *d, const iString *url) {
+    url = canonicalUrl_String(url);
+    if (!equal_String(d->mod.url, url)) {
+        d->flags |= urlChanged_DocumentWidgetFlag;
+        set_String(d->mod.url, url);
+    }
+}
+
 static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
     if (!d->request) {
         return;
@@ -2117,7 +3107,35 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
     }
     iGmResponse *resp = lockResponse_GmRequest(d->request);
     if (d->state == fetching_RequestState) {
+        /* Under certain conditions, inline any image response into the current document. */
+        if (d->requestLinkId &&
+            isSuccess_GmStatusCode(d->sourceStatus) &&
+            startsWithCase_String(&d->sourceMime, "text/gemini") &&
+            isSuccess_GmStatusCode(statusCode) &&
+            startsWithCase_String(&resp->meta, "image/")) {
+            /* This request is turned into a new media request in the current document. */
+            iDisconnect(GmRequest, d->request, updated, d, requestUpdated_DocumentWidget_);
+            iDisconnect(GmRequest, d->request, finished, d, requestFinished_DocumentWidget_);
+            iMediaRequest *mr = newReused_MediaRequest(d, d->requestLinkId, d->request);
+            unlockResponse_GmRequest(d->request);
+            d->request = NULL; /* ownership moved */
+            postCommand_Widget(d, "document.request.cancelled doc:%p", d);
+            pushBack_ObjectList(d->media, mr);
+            iRelease(mr);
+            /* Reset the fetch state, returning to the originating page. */
+            d->state = ready_RequestState;
+            if (equal_String(&mostRecentUrl_History(d->mod.history)->url, url_GmRequest(mr->req))) {
+                undo_History(d->mod.history);
+            }
+            setUrl_DocumentWidget_(d, url_GmDocument(d->view.doc));
+            updateFetchProgress_DocumentWidget_(d);
+            postCommand_Widget(d, "media.updated link:%u request:%p", d->requestLinkId, mr);
+            return;
+        }
+        /* Get ready for the incoming new document. */
         d->state = receivedPartialResponse_RequestState;
+        d->flags &= ~fromCache_DocumentWidgetFlag;
+        clear_ObjectList(d->media);
         updateTrust_DocumentWidget_(d, resp);
         if (isSuccess_GmStatusCode(statusCode)) {
             clear_Banner(d->banner);
@@ -2128,8 +3146,8 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
             equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini")) {
             statusCode = tlsServerCertificateNotVerified_GmStatusCode;
         }
-        init_Anim(&d->sideOpacity, 0);
-        init_Anim(&d->altTextOpacity, 0);
+        init_Anim(&d->view.sideOpacity, 0);
+        init_Anim(&d->view.altTextOpacity, 0);
         format_String(&d->sourceHeader,
                       "%s%s",
                       humanReadableStatusCode_(statusCode),
@@ -2143,7 +3161,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                    it is only displayed as an input dialog. */
                 visitUrl_Visited(visited_App(), d->mod.url, transient_VisitedUrlFlag);
                 iUrl parts;
-                init_Url(&parts, d->mod.url);                
+                init_Url(&parts, d->mod.url);
                 iWidget *dlg = makeValueInput_Widget(
                     as_Widget(d),
                     NULL,
@@ -2169,19 +3187,41 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                             NULL);
                         insertChildAfter_Widget(buttons, iClob(lineBreak), 0);
                     }
-                    else {
-                        lineBreak = new_LabelWidget("${dlg.input.linebreak}", "text.insert arg:10");
+                    if (lineBreak) {
+                        setFlags_Widget(as_Widget(lineBreak), frameless_WidgetFlag, iTrue);
+                        setTextColor_LabelWidget(lineBreak, uiTextDim_ColorId);
                     }
-                    setFlags_Widget(as_Widget(lineBreak), frameless_WidgetFlag, iTrue);
-                    setTextColor_LabelWidget(lineBreak, uiTextDim_ColorId);
                 }
-                setId_Widget(addChildPosFlags_Widget(buttons,
-                                                     iClob(new_LabelWidget("", NULL)),
-                                                     front_WidgetAddPos, frameless_WidgetFlag),
-                             "valueinput.counter");
+                iWidget *counter = (iWidget *) new_LabelWidget("", NULL);
+                setId_Widget(counter, "valueinput.counter");
+                setFlags_Widget(counter, frameless_WidgetFlag | resizeToParentHeight_WidgetFlag, iTrue);
+                if (deviceType_App() == desktop_AppDeviceType) {
+                    addChildPos_Widget(buttons, iClob(counter), front_WidgetAddPos);
+                }
+                else {
+                    insertChildAfter_Widget(buttons, iClob(counter), 1);
+                }
                 if (lineBreak && deviceType_App() != desktop_AppDeviceType) {
                     addChildPos_Widget(buttons, iClob(lineBreak), front_WidgetAddPos);
                 }
+                /* Menu for additional actions, past entries. */ {
+                    iMenuItem items[] = { { "${menu.input.precedingline}",
+                                            SDLK_v,
+                                            KMOD_PRIMARY | KMOD_SHIFT,
+                                            format_CStr("!valueinput.set ptr:%p text:%s",
+                                                        buttons,
+                                                        cstr_String(&d->linePrecedingLink)) } };
+                    iLabelWidget *menu = makeMenuButton_LabelWidget(midEllipsis_Icon, items, 1);
+                    if (deviceType_App() == desktop_AppDeviceType) {
+                        addChildPos_Widget(buttons, iClob(menu), front_WidgetAddPos);
+                    }
+                    else {
+                        insertChildAfterFlags_Widget(buttons, iClob(menu), 0,
+                                                     frameless_WidgetFlag | noBackground_WidgetFlag);
+                        setFont_LabelWidget(menu, font_LabelWidget((iLabelWidget *) lastChild_Widget(buttons)));
+                        setTextColor_LabelWidget(menu, uiTextAction_ColorId);
+                    }
+                }
                 setValidator_InputWidget(findChild_Widget(dlg, "input"), inputQueryValidator_, d);
                 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
                                                 statusCode == sensitiveInput_GmStatusCode);
@@ -2196,16 +3236,17 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
             case categorySuccess_GmStatusCode:
                 if (d->flags & urlChanged_DocumentWidgetFlag) {
                     /* Keep scroll position when reloading the same page. */
-                    reset_SmoothScroll(&d->scrollY);
+                    resetScroll_DocumentView_(&d->view);
                 }
-                pauseAllPlayers_Media(media_GmDocument(d->doc), iTrue);
-                iRelease(d->doc); /* new content incoming */
-                d->doc = new_GmDocument();
+                d->view.scrollY.pullActionTriggered = 0;
+                pauseAllPlayers_Media(media_GmDocument(d->view.doc), iTrue);
+                iReleasePtr(&d->view.doc); /* new content incoming */
                 delete_Gempub(d->sourceGempub);
                 d->sourceGempub = NULL;
                 destroy_Widget(d->footerButtons);
                 d->footerButtons = NULL;
-                resetWideRuns_DocumentWidget_(d);
+                d->view.doc = new_GmDocument();
+                resetWideRuns_DocumentView_(&d->view);
                 updateDocument_DocumentWidget_(d, resp, NULL, iTrue);
                 break;
             case categoryRedirect_GmStatusCode:
@@ -2260,6 +3301,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
         }
     }
     else if (d->state == receivedPartialResponse_RequestState) {
+        d->flags &= ~fromCache_DocumentWidgetFlag;
         switch (category_GmStatusCode(statusCode)) {
             case categorySuccess_GmStatusCode:
                 /* More content available. */
@@ -2272,37 +3314,6 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
     unlockResponse_GmRequest(d->request);
 }
 
-static iRangecc sourceLoc_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
-    return findLoc_GmDocument(d->doc, documentPos_DocumentWidget_(d, pos));
-}
-
-iDeclareType(MiddleRunParams)
-
-struct Impl_MiddleRunParams {
-    int midY;
-    const iGmRun *closest;
-    int distance;
-};
-
-static void find_MiddleRunParams_(void *params, const iGmRun *run) {
-    iMiddleRunParams *d = params;
-    if (isEmpty_Rect(run->bounds)) {
-        return;
-    }
-    const int distance = iAbs(mid_Rect(run->bounds).y - d->midY);
-    if (!d->closest || distance < d->distance) {
-        d->closest  = run;
-        d->distance = distance;
-    }
-}
-
-static const iGmRun *middleRun_DocumentWidget_(const iDocumentWidget *d) {
-    iRangei visRange = visibleRange_DocumentWidget_(d);
-    iMiddleRunParams params = { (visRange.start + visRange.end) / 2, NULL, 0 };
-    render_GmDocument(d->doc, visRange, find_MiddleRunParams_, &params);
-    return params.closest;
-}
-
 static void removeMediaRequest_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId) {
     iForEach(ObjectList, i, d->media) {
         iMediaRequest *req = (iMediaRequest *) i.object;
@@ -2313,19 +3324,9 @@ static void removeMediaRequest_DocumentWidget_(iDocumentWidget *d, iGmLinkId lin
     }
 }
 
-static iMediaRequest *findMediaRequest_DocumentWidget_(const iDocumentWidget *d, iGmLinkId linkId) {
-    iConstForEach(ObjectList, i, d->media) {
-        const iMediaRequest *req = (const iMediaRequest *) i.object;
-        if (req->linkId == linkId) {
-            return iConstCast(iMediaRequest *, req);
-        }
-    }
-    return NULL;
-}
-
 static iBool requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId, iBool enableFilters) {
     if (!findMediaRequest_DocumentWidget_(d, linkId)) {
-        const iString *mediaUrl = absoluteUrl_String(d->mod.url, linkUrl_GmDocument(d->doc, linkId));
+        const iString *mediaUrl = absoluteUrl_String(d->mod.url, linkUrl_GmDocument(d->view.doc, linkId));
         pushBack_ObjectList(d->media, iClob(new_MediaRequest(d, linkId, mediaUrl, enableFilters)));
         invalidate_DocumentWidget_(d);
         return iTrue;
@@ -2334,7 +3335,7 @@ static iBool requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId,
 }
 
 static iBool isDownloadRequest_DocumentWidget(const iDocumentWidget *d, const iMediaRequest *req) {
-    return findMediaForLink_Media(constMedia_GmDocument(d->doc), req->linkId, download_MediaType).type != 0;
+    return findMediaForLink_Media(constMedia_GmDocument(d->view.doc), req->linkId, download_MediaType).type != 0;
 }
 
 static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
@@ -2358,21 +3359,21 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
             if (isDownloadRequest_DocumentWidget(d, req) ||
                 startsWith_String(&resp->meta, "audio/")) {
                 /* TODO: Use a helper? This is same as below except for the partialData flag. */
-                if (setData_Media(media_GmDocument(d->doc),
+                if (setData_Media(media_GmDocument(d->view.doc),
                                   req->linkId,
                                   &resp->meta,
                                   &resp->body,
                                   partialData_MediaFlag | allowHide_MediaFlag)) {
-                    redoLayout_GmDocument(d->doc);
+                    redoLayout_GmDocument(d->view.doc);
                 }
-                updateVisible_DocumentWidget_(d);
+                updateVisible_DocumentView_(&d->view);
                 invalidate_DocumentWidget_(d);
                 refresh_Widget(as_Widget(d));
             }
             unlockResponse_GmRequest(req->req);
         }
         /* Update the link's progress. */
-        invalidateLink_DocumentWidget_(d, req->linkId);
+        invalidateLink_DocumentView_(&d->view, req->linkId);
         refresh_Widget(d);
         return iTrue;
     }
@@ -2383,14 +3384,14 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
             if (isDownloadRequest_DocumentWidget(d, req) ||
                 startsWith_String(meta_GmRequest(req->req), "image/") ||
                 startsWith_String(meta_GmRequest(req->req), "audio/")) {
-                setData_Media(media_GmDocument(d->doc),
+                setData_Media(media_GmDocument(d->view.doc),
                               req->linkId,
                               meta_GmRequest(req->req),
                               body_GmRequest(req->req),
                               allowHide_MediaFlag);
-                redoLayout_GmDocument(d->doc);
-                iZap(d->visibleRuns); /* pointers invalidated */
-                updateVisible_DocumentWidget_(d);
+                redoLayout_GmDocument(d->view.doc);
+                iZap(d->view.visibleRuns); /* pointers invalidated */
+                updateVisible_DocumentView_(&d->view);
                 invalidate_DocumentWidget_(d);
                 refresh_Widget(as_Widget(d));
             }
@@ -2405,25 +3406,13 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
     return iFalse;
 }
 
-static void allocVisBuffer_DocumentWidget_(const iDocumentWidget *d) {
-    const iWidget *w         = constAs_Widget(d);
-    const iBool    isVisible = isVisible_Widget(w);
-    const iInt2    size      = bounds_Widget(w).size;
-    if (isVisible) {
-        alloc_VisBuf(d->visBuf, size, 1);
-    }
-    else {
-        dealloc_VisBuf(d->visBuf);
-    }
-}
-
 static iBool fetchNextUnfetchedImage_DocumentWidget_(iDocumentWidget *d) {
-    iConstForEach(PtrArray, i, &d->visibleLinks) {
+    iConstForEach(PtrArray, i, &d->view.visibleLinks) {
         const iGmRun *run = i.ptr;
         if (run->linkId && run->mediaType == none_MediaType &&
             ~run->flags & decoration_GmRunFlag) {
-            const int linkFlags = linkFlags_GmDocument(d->doc, run->linkId);
-            if (isMediaLink_GmDocument(d->doc, run->linkId) &&
+            const int linkFlags = linkFlags_GmDocument(d->view.doc, run->linkId);
+            if (isMediaLink_GmDocument(d->view.doc, run->linkId) &&
                 linkFlags & imageFileExtension_GmLinkFlag &&
                 ~linkFlags & content_GmLinkFlag && ~linkFlags & permanent_GmLinkFlag ) {
                 if (requestMedia_DocumentWidget_(d, run->linkId, iTrue)) {
@@ -2435,9 +3424,8 @@ static iBool fetchNextUnfetchedImage_DocumentWidget_(iDocumentWidget *d) {
     return iFalse;
 }
 
-static const iString *saveToDownloads_(const iString *url, const iString *mime, const iBlock *content,
-                                       iBool showDialog) {
-    const iString *savePath = downloadPathForUrl_App(url, mime);
+static iBool saveToFile_(const iString *savePath, const iBlock *content, iBool showDialog) {
+    iBool ok = iFalse;
     /* Write the file. */ {
         iFile *f = new_File(savePath);
         if (open_File(f, writeOnly_FileMode)) {
@@ -2449,21 +3437,21 @@ static const iString *saveToDownloads_(const iString *url, const iString *mime,
             exportDownloadedFile_iOS(savePath);
 #else
             if (showDialog) {
-            const iMenuItem items[2] = {
-                { "${dlg.save.opendownload}", 0, 0,
-                    format_CStr("!open url:%s", cstrCollect_String(makeFileUrl_String(savePath))) },
-                { "${dlg.message.ok}", 0, 0, "message.ok" },
-            };
-            makeMessage_Widget(uiHeading_ColorEscape "${heading.save}",
-                                   format_CStr("%s\n${dlg.save.size} %.3f %s",
-                                               cstr_String(path_File(f)),
-                                           isMega ? size / 1.0e6f : (size / 1.0e3f),
-                                           isMega ? "${mb}" : "${kb}"),
-                                   items,
-                                   iElemCount(items));
+                const iMenuItem items[2] = {
+                    { "${dlg.save.opendownload}", 0, 0,
+                        format_CStr("!open url:%s", cstrCollect_String(makeFileUrl_String(savePath))) },
+                    { "${dlg.message.ok}", 0, 0, "message.ok" },
+                };
+                makeMessage_Widget(uiHeading_ColorEscape "${heading.save}",
+                                       format_CStr("%s\n${dlg.save.size} %.3f %s",
+                                                   cstr_String(path_File(f)),
+                                               isMega ? size / 1.0e6f : (size / 1.0e3f),
+                                               isMega ? "${mb}" : "${kb}"),
+                                       items,
+                                       iElemCount(items));
             }
 #endif
-            return savePath;
+            ok = iTrue;
         }
         else {
             makeSimpleMessage_Widget(uiTextCaution_ColorEscape "${heading.save.error}",
@@ -2471,7 +3459,16 @@ static const iString *saveToDownloads_(const iString *url, const iString *mime,
         }
         iRelease(f);
     }
-    return collectNew_String();
+    return ok;
+}
+
+static const iString *saveToDownloads_(const iString *url, const iString *mime, const iBlock *content,
+                                       iBool showDialog) {
+    const iString *savePath = downloadPathForUrl_App(url, mime);
+    if (!saveToFile_(savePath, content, showDialog)) {
+        return collectNew_String();
+    }
+    return savePath;
 }
 
 static void addAllLinks_(void *context, const iGmRun *run) {
@@ -2481,71 +3478,6 @@ static void addAllLinks_(void *context, const iGmRun *run) {
     }
 }
 
-static size_t visibleLinkOrdinal_DocumentWidget_(const iDocumentWidget *d, iGmLinkId linkId) {
-    size_t ord = 0;
-    const iRangei visRange = visibleRange_DocumentWidget_(d);
-    iConstForEach(PtrArray, i, &d->visibleLinks) {
-        const iGmRun *run = i.ptr;
-        if (top_Rect(run->visBounds) >= visRange.start + gap_UI * d->pageMargin * 4 / 5) {
-            if (run->flags & decoration_GmRunFlag && run->linkId) {
-                if (run->linkId == linkId) return ord;
-                ord++;
-            }
-        }
-    }
-    return iInvalidPos;
-}
-
-/* Sorted by proximity to F and J. */
-static const int homeRowKeys_[] = {
-    'f', 'd', 's', 'a',
-    'j', 'k', 'l',
-    'r', 'e', 'w', 'q',
-    'u', 'i', 'o', 'p',
-    'v', 'c', 'x', 'z',
-    'm', 'n',
-    'g', 'h',
-    'b',
-    't', 'y',
-};
-
-static iBool updateDocumentWidthRetainingScrollPosition_DocumentWidget_(iDocumentWidget *d,
-                                                                        iBool keepCenter) {
-    const int newWidth = documentWidth_DocumentWidget_(d);
-    if (newWidth == size_GmDocument(d->doc).x && !keepCenter /* not a font change */) {
-        return iFalse;
-    }
-    /* Font changes (i.e., zooming) will keep the view centered, otherwise keep the top
-       of the visible area fixed. */
-    const iGmRun *run     = keepCenter ? middleRun_DocumentWidget_(d) : d->visibleRuns.start;
-    const char *  runLoc  = (run ? run->text.start : NULL);
-    int           voffset = 0;
-    if (!keepCenter && run) {
-        /* Keep the first visible run visible at the same position. */
-        /* TODO: First *fully* visible run? */
-        voffset = visibleRange_DocumentWidget_(d).start - top_Rect(run->visBounds);
-    }
-    setWidth_GmDocument(d->doc, newWidth, width_Widget(d));
-    setWidth_Banner(d->banner, newWidth);
-    documentRunsInvalidated_DocumentWidget_(d);
-    if (runLoc && !keepCenter) {
-        run = findRunAtLoc_GmDocument(d->doc, runLoc);
-        if (run) {
-            scrollTo_DocumentWidget_(d,
-                                     top_Rect(run->visBounds) +
-                                         lineHeight_Text(paragraph_FontId) + voffset,
-                                     iFalse);
-        }
-    }
-    else if (runLoc && keepCenter) {
-        run = findRunAtLoc_GmDocument(d->doc, runLoc);
-        if (run) {
-            scrollTo_DocumentWidget_(d, mid_Rect(run->bounds).y, iTrue);
-        }
-    }
-    return iTrue;
-}
-
 static iBool handlePinch_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
     if (equal_Command(cmd, "pinch.began")) {
         d->pinchZoomInitial = d->pinchZoomPosted = prefs_App()->zoomPercent;
@@ -2577,15 +3509,12 @@ static void swap_DocumentWidget_(iDocumentWidget *d, iGmDocument *doc,
                                  iDocumentWidget *swapBuffersWith) {
     if (doc) {
         iAssert(isInstance_Object(doc, &Class_GmDocument));
-        iGmDocument *copy = ref_Object(doc);
-        iRelease(d->doc);
-        d->doc = copy;
-        d->scrollY = swapBuffersWith->scrollY;
-        updateVisible_DocumentWidget_(d);
-        iSwap(iVisBuf *,     d->visBuf,     swapBuffersWith->visBuf);
-        iSwap(iVisBufMeta *, d->visBufMeta, swapBuffersWith->visBufMeta);
-        iSwap(iDrawBufs *,   d->drawBufs,   swapBuffersWith->drawBufs);
-        invalidate_DocumentWidget_(swapBuffersWith);
+        replaceDocument_DocumentWidget_(d, doc);
+        iSwap(iBanner *, d->banner, swapBuffersWith->banner);
+        setOwner_Banner(d->banner, d);
+        setOwner_Banner(swapBuffersWith->banner, swapBuffersWith);
+        swap_DocumentView_(&d->view, &swapBuffersWith->view);
+//        invalidate_DocumentWidget_(swapBuffersWith);
     }
 }
 
@@ -2593,11 +3522,49 @@ static iWidget *swipeParent_DocumentWidget_(iDocumentWidget *d) {
     return findChild_Widget(as_Widget(d)->root->widget, "doctabs");
 }
 
+static void setupSwipeOverlay_DocumentWidget_(iDocumentWidget *d, iWidget *overlay) {
+    iWidget *w = as_Widget(d);
+    iWidget *swipeParent = swipeParent_DocumentWidget_(d);
+    /* The target takes the old document and jumps on top. */
+    overlay->rect.pos = windowToInner_Widget(swipeParent, innerToWindow_Widget(w, zero_I2()));
+    /* Note: `innerToWindow_Widget` does not apply visual offset. */
+    overlay->rect.size = w->rect.size;
+    setFlags_Widget(overlay, fixedPosition_WidgetFlag | fixedSize_WidgetFlag, iTrue);
+//        swap_DocumentWidget_(target, d->doc, d);
+    setFlags_Widget(as_Widget(d), refChildrenOffset_WidgetFlag, iTrue);
+    as_Widget(d)->offsetRef = swipeParent;
+    /* `overlay` animates off the screen to the right. */
+    const int fromPos = value_Anim(&w->visualOffset);
+    const int toPos   = width_Widget(overlay);
+    setVisualOffset_Widget(overlay, fromPos, 0, 0);
+    /* Bigger screen, faster swipes. */
+    if (deviceType_App() == desktop_AppDeviceType) {
+        setVisualOffset_Widget(overlay, toPos, 250, easeOut_AnimFlag | softer_AnimFlag);
+    }
+    else {
+        const float devFactor = (deviceType_App() == phone_AppDeviceType ? 1.0f : 2.0f);
+        float swipe = iClamp(d->swipeSpeed, devFactor * 400, devFactor * 1000) * gap_UI;
+        uint32_t span = ((toPos - fromPos) / swipe) * 1000;
+    //    printf("from:%d to:%d swipe:%f span:%u\n", fromPos, toPos, d->swipeSpeed, span);
+        setVisualOffset_Widget(overlay, toPos, span, deviceType_App() == tablet_AppDeviceType ?
+                               easeOut_AnimFlag : 0);
+    }
+    setVisualOffset_Widget(w, 0, 0, 0);
+}
+
 static iBool handleSwipe_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
+    /* TODO: Cleanup
+       If DocumentWidget is refactored to split the document presentation from state
+       and request management (a new DocumentView class), plain views could be used for this
+       animation without having to mess with the complete state of the DocumentWidget. That
+       seems like a less error-prone approach -- the current implementation will likely break
+       down (again) if anything is changed in the document internals.
+    */
     iWidget *w = as_Widget(d);
-    /* Swipe animations are rather complex and utilize both cached GmDocument content
-       and temporary DocumentWidgets. Depending on the swipe direction, this DocumentWidget
-       may wait until the finger is released to actually perform the navigation action. */
+    /* The swipe animation is implemented in a rather complex way. It utilizes both cached
+       GmDocument content and temporary underlay/overlay DocumentWidgets. Depending on the
+       swipe direction, the DocumentWidget `d` may wait until the finger is released to actually
+       perform the navigation action. */
     if (equal_Command(cmd, "edgeswipe.moved")) {
         //printf("[%p] responds to edgeswipe.moved\n", d);
         as_Widget(d)->offsetRef = NULL;
@@ -2608,32 +3575,40 @@ static iBool handleSwipe_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
                 return iTrue;
             }
             iWidget *swipeParent = swipeParent_DocumentWidget_(d);
-            /* The temporary "swipeIn" will display the previous page until the finger is lifted. */
+            if (findChild_Widget(swipeParent, "swipeout")) {
+                return iTrue; /* too fast, previous animation hasn't finished */
+            }
+            /* The temporary "swipein" will display the previous page until the finger is lifted. */
             iDocumentWidget *swipeIn = findChild_Widget(swipeParent, "swipein");
             if (!swipeIn) {
-                const iBool sidebarSwipe = (isPortraitPhone_App() &&
-                                            d->flags & openedFromSidebar_DocumentWidgetFlag &&
-                                            !isVisible_Widget(findWidget_App("sidebar")));
                 swipeIn = new_DocumentWidget();
+                swipeIn->flags |= animationPlaceholder_DocumentWidgetFlag;
                 setId_Widget(as_Widget(swipeIn), "swipein");
                 setFlags_Widget(as_Widget(swipeIn),
                                 disabled_WidgetFlag | refChildrenOffset_WidgetFlag |
                                 fixedPosition_WidgetFlag | fixedSize_WidgetFlag, iTrue);
+                setFlags_Widget(findChild_Widget(as_Widget(swipeIn), "scroll"), hidden_WidgetFlag, iTrue);
                 swipeIn->widget.rect.pos = windowToInner_Widget(swipeParent, localToWindow_Widget(w, w->rect.pos));
                 swipeIn->widget.rect.size = d->widget.rect.size;
                 swipeIn->widget.offsetRef = parent_Widget(w);
-                if (!sidebarSwipe) {
-                    iRecentUrl *recent = new_RecentUrl();
-                    preceding_History(d->mod.history, recent);
-                    if (recent->cachedDoc) {
-                        iChangeRef(swipeIn->doc, recent->cachedDoc);
-                        updateScrollMax_DocumentWidget_(d);
-                        setValue_Anim(&swipeIn->scrollY.pos,
-                                      pageHeight_DocumentWidget_(d) * recent->normScrollY, 0);
-                        updateVisible_DocumentWidget_(swipeIn);
-                        swipeIn->drawBufs->flags |= updateTimestampBuf_DrawBufsFlag | updateSideBuf_DrawBufsFlag;
+                /* Use a cached document for the layer underneath. */ {
+                    lock_History(d->mod.history);
+                    iRecentUrl *recent = precedingLocked_History(d->mod.history);
+                    if (recent && recent->cachedResponse) {
+                        setUrl_DocumentWidget_(swipeIn, &recent->url);
+                        updateFromCachedResponse_DocumentWidget_(swipeIn,
+                                                                 recent->normScrollY,
+                                                                 recent->cachedResponse,
+                                                                 recent->cachedDoc);
+                        parseUser_DocumentWidget_(swipeIn);
+                        updateBanner_DocumentWidget_(swipeIn);
                     }
-                    delete_RecentUrl(recent);
+                    else {
+                        setUrlAndSource_DocumentWidget(swipeIn, &recent->url,
+                                                       collectNewCStr_String("text/gemini"),
+                                                       collect_Block(new_Block(0)));
+                    }
+                    unlock_History(d->mod.history);
                 }
                 addChildPos_Widget(swipeParent, iClob(swipeIn), front_WidgetAddPos);
             }
@@ -2641,24 +3616,36 @@ static iBool handleSwipe_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
         if (side == 2) { /* right edge */
             if (offset < -get_Window()->pixelRatio * 10) {
                 int animSpan = 10;
-                if (!atLatest_History(d->mod.history) &&
-                    ~flags_Widget(w) & dragged_WidgetFlag) {
+                if (!atNewest_History(d->mod.history) && ~flags_Widget(w) & dragged_WidgetFlag) {
+                    iWidget *swipeParent = swipeParent_DocumentWidget_(d);
+                    if (findChild_Widget(swipeParent, "swipeout")) {
+                        return iTrue; /* too fast, previous animation hasn't finished */
+                    }
+                    /* Setup the drag. `d` will be moving with the finger. */
                     animSpan = 0;
                     postCommand_Widget(d, "navigate.forward");
                     setFlags_Widget(w, dragged_WidgetFlag, iTrue);
                     /* Set up the swipe dummy. */
-                    iWidget *swipeParent = swipeParent_DocumentWidget_(d);
                     iDocumentWidget *target = new_DocumentWidget();
+                    target->flags |= animationPlaceholder_DocumentWidgetFlag;
                     setId_Widget(as_Widget(target), "swipeout");
-                    /* The target takes the old document and jumps on top. */
+                    /* "swipeout" takes `d`'s document and goes underneath. */
                     target->widget.rect.pos = windowToInner_Widget(swipeParent, localToWindow_Widget(w, w->rect.pos));
                     target->widget.rect.size = d->widget.rect.size;
                     setFlags_Widget(as_Widget(target), fixedPosition_WidgetFlag | fixedSize_WidgetFlag, iTrue);
-                    swap_DocumentWidget_(target, d->doc, d);
+                    swap_DocumentWidget_(target, d->view.doc, d);
                     addChildPos_Widget(swipeParent, iClob(target), front_WidgetAddPos);
                     setFlags_Widget(as_Widget(target), refChildrenOffset_WidgetFlag, iTrue);
                     as_Widget(target)->offsetRef = parent_Widget(w);
-                    destroy_Widget(as_Widget(target)); /* will be actually deleted after animation finishes */
+                    /* Mark it for deletion after animation finishes. */
+                    destroy_Widget(as_Widget(target));
+                    /* The `d` document will now navigate forward and be replaced with a cached
+                       copy. However, if a cached response isn't available, we'll need to show a
+                       blank page. */
+                    setUrlAndSource_DocumentWidget(d,
+                                                   collectNewCStr_String("about:blank"),
+                                                   collectNewCStr_String("text/gemini"),
+                                                   collect_Block(new_Block(0)));
                 }
                 if (flags_Widget(w) & dragged_WidgetFlag) {
                     setVisualOffset_Widget(w, width_Widget(w) +
@@ -2674,41 +3661,68 @@ static iBool handleSwipe_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
     }
     if (equal_Command(cmd, "edgeswipe.ended") && argLabel_Command(cmd, "side") == 2) {
         if (argLabel_Command(cmd, "abort") && flags_Widget(w) & dragged_WidgetFlag) {
+            setFlags_Widget(w, dragged_WidgetFlag, iFalse);
             postCommand_Widget(d, "navigate.back");
+            /* We must now undo the swap that was done when the drag started. */
+            /* TODO: Currently not animated! What exactly is the appropriate thing to do here? */
+            iWidget *swipeParent = swipeParent_DocumentWidget_(d);
+            iDocumentWidget *swipeOut = findChild_Widget(swipeParent, "swipeout");
+            swap_DocumentWidget_(d, swipeOut->view.doc, swipeOut);
+//            const int visOff = visualOffsetByReference_Widget(w);
+            w->offsetRef = NULL;
+//            setVisualOffset_Widget(w, visOff, 0, 0);
+//            setVisualOffset_Widget(w, 0, 150, 0);
+            setVisualOffset_Widget(w, 0, 0, 0);
+            /* Make it an overlay instead. */
+//            removeChild_Widget(swipeParent, swipeOut);
+//            addChildPos_Widget(swipeParent, iClob(swipeOut), back_WidgetAddPos);
+//            setupSwipeOverlay_DocumentWidget_(d, as_Widget(swipeOut));
+            return iTrue;
         }
+        iAssert(~d->flags & animationPlaceholder_DocumentWidgetFlag);
         setFlags_Widget(w, dragged_WidgetFlag, iFalse);
-        setVisualOffset_Widget(w, 0, 100, 0);
+        setVisualOffset_Widget(w, 0, 250, easeOut_AnimFlag | softer_AnimFlag);
         return iTrue;
     }
     if (equal_Command(cmd, "edgeswipe.ended") && argLabel_Command(cmd, "side") == 1) {
         iWidget *swipeParent = swipeParent_DocumentWidget_(d);
-        iWidget *swipeIn = findChild_Widget(swipeParent, "swipein");
+        iDocumentWidget *swipeIn = findChild_Widget(swipeParent, "swipein");
+        d->swipeSpeed = argLabel_Command(cmd, "speed") / gap_UI;
+        /* "swipe.back" will soon follow. The `d` document will do the actual back navigation,
+            switching immediately to a cached page. However, if one is not available, we'll need
+            to show a blank page for a while. */
         if (swipeIn) {
-            swipeIn->offsetRef = NULL;
-            destroy_Widget(swipeIn);
+            if (!argLabel_Command(cmd, "abort")) {
+                iWidget *swipeParent = swipeParent_DocumentWidget_(d);
+                /* What was being shown in the `d` document is now being swapped to
+                   the outgoing page animation. */
+                iDocumentWidget *target = new_DocumentWidget();
+                target->flags |= animationPlaceholder_DocumentWidgetFlag;
+                addChildPos_Widget(swipeParent, iClob(target), back_WidgetAddPos);
+                setId_Widget(as_Widget(target), "swipeout");
+                setFlags_Widget(as_Widget(target), disabled_WidgetFlag, iTrue);
+                swap_DocumentWidget_(target, d->view.doc, d);
+                setUrlAndSource_DocumentWidget(d,
+                                               swipeIn->mod.url,
+                                               collectNewCStr_String("text/gemini"),
+                                               collect_Block(new_Block(0)));
+                as_Widget(swipeIn)->offsetRef = NULL;
+            }
+            destroy_Widget(as_Widget(swipeIn));
         }
     }
     if (equal_Command(cmd, "swipe.back")) {
+        iWidget *swipeParent = swipeParent_DocumentWidget_(d);
+        iDocumentWidget *target = findChild_Widget(swipeParent, "swipeout");
         if (atOldest_History(d->mod.history)) {
             setVisualOffset_Widget(w, 0, 100, 0);
+            if (target) {
+                destroy_Widget(as_Widget(target)); /* didn't need it after all */
+            }
             return iTrue;
         }
-        iWidget *swipeParent = swipeParent_DocumentWidget_(d);
-        iDocumentWidget *target = new_DocumentWidget();
-        setId_Widget(as_Widget(target), "swipeout");
-        /* The target takes the old document and jumps on top. */
-        target->widget.rect.pos = windowToInner_Widget(swipeParent, innerToWindow_Widget(w, zero_I2()));
-        /* Note: `innerToWindow_Widget` does not apply visual offset. */
-        target->widget.rect.size = w->rect.size;
-        setFlags_Widget(as_Widget(target), fixedPosition_WidgetFlag | fixedSize_WidgetFlag, iTrue);
-        swap_DocumentWidget_(target, d->doc, d);
-        addChildPos_Widget(swipeParent, iClob(target), back_WidgetAddPos);
-        setFlags_Widget(as_Widget(d), refChildrenOffset_WidgetFlag, iTrue);
-        as_Widget(d)->offsetRef = swipeParent;
-        setVisualOffset_Widget(as_Widget(target), value_Anim(&w->visualOffset), 0, 0);
-        setVisualOffset_Widget(as_Widget(target), width_Widget(target), 150, 0);
+        setupSwipeOverlay_DocumentWidget_(d, as_Widget(target));
         destroy_Widget(as_Widget(target)); /* will be actually deleted after animation finishes */
-        setVisualOffset_Widget(w, 0, 0, 0);
         postCommand_Widget(d, "navigate.back");
         return iTrue;
     }
@@ -2733,27 +3747,34 @@ static iBool cancelRequest_DocumentWidget_(iDocumentWidget *d, iBool postBack) {
     return iFalse;
 }
 
+static const int smoothDuration_DocumentWidget_(enum iScrollType type) {
+    return 600 /* milliseconds */ * scrollSpeedFactor_Prefs(prefs_App(), type);
+}
+
 static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
     iWidget *w = as_Widget(d);
     if (equal_Command(cmd, "document.openurls.changed")) {
+        if (d->flags & animationPlaceholder_DocumentWidgetFlag) {
+            return iFalse;
+        }
         /* When any tab changes its document URL, update the open link indicators. */
-        if (updateOpenURLs_GmDocument(d->doc)) {
+        if (updateOpenURLs_GmDocument(d->view.doc)) {
             invalidate_DocumentWidget_(d);
             refresh_Widget(d);
         }
         return iFalse;
     }
     if (equal_Command(cmd, "visited.changed")) {
-        updateVisitedLinks_GmDocument(d->doc);
-        invalidateVisibleLinks_DocumentWidget_(d);
+        updateVisitedLinks_GmDocument(d->view.doc);
+        invalidateVisibleLinks_DocumentView_(&d->view);
         return iFalse;
     }
     if (equal_Command(cmd, "document.render")) /* `Periodic` makes direct dispatch to here */ {
 //        printf("%u: document.render\n", SDL_GetTicks());
-        if (SDL_GetTicks() - d->drawBufs->lastRenderTime > 150) {
+        if (SDL_GetTicks() - d->view.drawBufs->lastRenderTime > 150) {
             remove_Periodic(periodic_App(), d);
             /* Scrolling has stopped, begin filling up the buffer. */
-            if (d->visBuf->buffers[0].texture) {
+            if (d->view.visBuf->buffers[0].texture) {
                 addTicker_App(prerender_DocumentWidget_, d);
             }
         }
@@ -2762,17 +3783,17 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed") ||
              equal_Command(cmd, "keyroot.changed")) {
         if (equal_Command(cmd, "font.changed")) {
-            invalidateCachedLayout_History(d->mod.history);   
+            invalidateCachedLayout_History(d->mod.history);
         }
         /* Alt/Option key may be involved in window size changes. */
         setLinkNumberMode_DocumentWidget_(d, iFalse);
         d->phoneToolbar = findWidget_App("toolbar");
         const iBool keepCenter = equal_Command(cmd, "font.changed");
-        updateDocumentWidthRetainingScrollPosition_DocumentWidget_(d, keepCenter);
-        d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
-        updateVisible_DocumentWidget_(d);
+        updateDocumentWidthRetainingScrollPosition_DocumentView_(&d->view, keepCenter);
+        d->view.drawBufs->flags |= updateSideBuf_DrawBufsFlag;
+        updateVisible_DocumentView_(&d->view);
         invalidate_DocumentWidget_(d);
-        dealloc_VisBuf(d->visBuf);
+        dealloc_VisBuf(d->view.visBuf);
         updateWindowTitle_DocumentWidget_(d);
         showOrHidePinningIndicator_DocumentWidget_(d);
         refresh_Widget(w);
@@ -2780,7 +3801,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "window.focus.lost")) {
         if (d->flags & showLinkNumbers_DocumentWidgetFlag) {
             setLinkNumberMode_DocumentWidget_(d, iFalse);
-            invalidateVisibleLinks_DocumentWidget_(d);
+            invalidateVisibleLinks_DocumentView_(&d->view);
             refresh_Widget(w);
         }
         return iFalse;
@@ -2788,18 +3809,21 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "window.mouse.exited")) {
         return iFalse;
     }
-    else if (equal_Command(cmd, "theme.changed") && document_App() == d) {
-//        invalidateTheme_History(d->mod.history); /* cached colors */
-        updateTheme_DocumentWidget_(d);
-        updateVisible_DocumentWidget_(d);
-        updateTrust_DocumentWidget_(d, NULL);
-        d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
-        invalidate_DocumentWidget_(d);
-        refresh_Widget(w);
+    else if (equal_Command(cmd, "theme.changed")) {
+        invalidatePalette_GmDocument(d->view.doc);
+        invalidateTheme_History(d->mod.history); /* forget cached color palettes */
+        if (document_App() == d) {
+            updateTheme_DocumentWidget_(d);
+            updateVisible_DocumentView_(&d->view);
+            updateTrust_DocumentWidget_(d, NULL);
+            d->view.drawBufs->flags |= updateSideBuf_DrawBufsFlag;
+            invalidate_DocumentWidget_(d);
+            refresh_Widget(w);
+        }
     }
     else if (equal_Command(cmd, "document.layout.changed") && document_Root(get_Root()) == d) {
         if (argLabel_Command(cmd, "redo")) {
-            redoLayout_GmDocument(d->doc);
+            redoLayout_GmDocument(d->view.doc);
         }
         updateSize_DocumentWidget(d);
     }
@@ -2822,11 +3846,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             updateFetchProgress_DocumentWidget_(d);
             updateHover_Window(window_Widget(w));
         }
-        init_Anim(&d->sideOpacity, 0);
-        init_Anim(&d->altTextOpacity, 0);
-        updateSideOpacity_DocumentWidget_(d, iFalse);
+        init_Anim(&d->view.sideOpacity, 0);
+        init_Anim(&d->view.altTextOpacity, 0);
+        updateSideOpacity_DocumentView_(&d->view, iFalse);
         updateWindowTitle_DocumentWidget_(d);
-        allocVisBuffer_DocumentWidget_(d);
+        allocVisBuffer_DocumentView_(&d->view);
         animateMedia_DocumentWidget_(d);
         remove_Periodic(periodic_App(), d);
         removeTicker_App(prerender_DocumentWidget_, d);
@@ -2850,8 +3874,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                         selectWords_DocumentWidgetFlag; /* finger-based selection is imprecise */
             d->flags &= ~selectLines_DocumentWidgetFlag;
             setFadeEnabled_ScrollWidget(d->scroll, iFalse);
-            d->selectMark = sourceLoc_DocumentWidget_(d, d->contextPos);
-            extendRange_Rangecc(&d->selectMark, range_String(source_GmDocument(d->doc)),
+            d->selectMark = sourceLoc_DocumentView_(&d->view, d->contextPos);
+            extendRange_Rangecc(&d->selectMark, range_String(source_GmDocument(d->view.doc)),
                                 word_RangeExtension | bothStartAndEnd_RangeExtension);
             d->initialSelectMark = d->selectMark;
         }
@@ -2865,7 +3889,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                                       timeVerified_GmCertFlag);
         const iBool canTrust = ~d->certFlags & trusted_GmCertFlag &&
                                ((d->certFlags & requiredForTrust) == requiredForTrust);
-        const iRecentUrl *recent = findUrl_History(d->mod.history, d->mod.url);
+        const iRecentUrl *recent = constMostRecentUrl_History(d->mod.history);
         const iString *meta = &d->sourceMime;
         if (recent && recent->cachedResponse) {
             meta = &recent->cachedResponse->meta;
@@ -2945,7 +3969,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
 //        setFixedSize_Widget(sizer, init_I2(gap_UI * 65, 1));
 //        addChildFlags_Widget(dlg, iClob(sizer), frameless_WidgetFlag);
 //        setFlags_Widget(dlg, centerHorizontal_WidgetFlag, iFalse);
-        if (deviceType_App() != phone_AppDeviceType) {
+        if (deviceType_App() == desktop_AppDeviceType) {
             const iWidget *lockButton = findWidget_Root("navbar.lock");
             setPos_Widget(dlg, windowToLocal_Widget(dlg, bottomLeft_Rect(bounds_Widget(lockButton))));
         }
@@ -2994,9 +4018,16 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         else {
             /* Full document. */
-            copied = copy_String(source_GmDocument(d->doc));
+            copied = copy_String(source_GmDocument(d->view.doc));
+        }
+        if (argLabel_Command(cmd, "share")) {
+#if defined (iPlatformAppleMobile)
+            openTextActivityView_iOS(copied);
+#endif
+        }
+        else {
+            SDL_SetClipboardText(cstr_String(copied));
         }
-        SDL_SetClipboardText(cstr_String(copied));
         delete_String(copied);
         if (flags_Widget(w) & touchDrag_WidgetFlag) {
             postCommand_Widget(w, "document.select arg:0");
@@ -3006,7 +4037,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "document.copylink") && document_App() == d) {
         if (d->contextLink) {
             SDL_SetClipboardText(cstr_String(canonicalUrl_String(absoluteUrl_String(
-                d->mod.url, linkUrl_GmDocument(d->doc, d->contextLink->linkId)))));
+                d->mod.url, linkUrl_GmDocument(d->view.doc, d->contextLink->linkId)))));
         }
         else {
             SDL_SetClipboardText(cstr_String(canonicalUrl_String(d->mod.url)));
@@ -3016,13 +4047,13 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equalWidget_Command(cmd, w, "document.downloadlink")) {
         if (d->contextLink) {
             const iGmLinkId linkId = d->contextLink->linkId;
-            setUrl_Media(media_GmDocument(d->doc),
+            setUrl_Media(media_GmDocument(d->view.doc),
                          linkId,
                          download_MediaType,
-                         linkUrl_GmDocument(d->doc, linkId));
+                         linkUrl_GmDocument(d->view.doc, linkId));
             requestMedia_DocumentWidget_(d, linkId, iFalse /* no filters */);
-            redoLayout_GmDocument(d->doc); /* inline downloader becomes visible */
-            updateVisible_DocumentWidget_(d);
+            redoLayout_GmDocument(d->view.doc); /* inline downloader becomes visible */
+            updateVisible_DocumentView_(&d->view);
             invalidate_DocumentWidget_(d);
             refresh_Widget(w);
         }
@@ -3055,6 +4086,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equalWidget_Command(cmd, w, "document.request.finished") &&
              id_GmRequest(d->request) == argU32Label_Command(cmd, "reqid")) {
+        d->flags &= ~fromCache_DocumentWidgetFlag;
         set_Block(&d->sourceContent, body_GmRequest(d->request));
         if (!isSuccess_GmStatusCode(status_GmRequest(d->request))) {
             /* TODO: Why is this here? Can it be removed? */
@@ -3066,7 +4098,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         updateFetchProgress_DocumentWidget_(d);
         checkResponse_DocumentWidget_(d);
         if (category_GmStatusCode(status_GmRequest(d->request)) == categorySuccess_GmStatusCode) {
-            init_Anim(&d->scrollY.pos, d->initNormScrollY * pageHeight_DocumentWidget_(d)); /* TODO: unless user already scrolled! */
+            init_Anim(&d->view.scrollY.pos, d->initNormScrollY * pageHeight_DocumentView_(&d->view));
+            /* TODO: unless user already scrolled! */
         }
         addBannerWarnings_DocumentWidget_(d);
         iChangeFlags(d->flags,
@@ -3076,6 +4109,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         postProcessRequestContent_DocumentWidget_(d, iFalse);
         /* The response may be cached. */
         if (d->request) {
+            iAssert(~d->flags & animationPlaceholder_DocumentWidgetFlag);
+            iAssert(~d->flags & fromCache_DocumentWidgetFlag);
             if (!equal_Rangecc(urlScheme_String(d->mod.url), "about") &&
                 (startsWithCase_String(meta_GmRequest(d->request), "text/") ||
                  !cmp_String(&d->sourceMime, mimeType_Gempub))) {
@@ -3084,8 +4119,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             }
         }
         iReleasePtr(&d->request);
-        updateVisible_DocumentWidget_(d);
-        d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
+        updateVisible_DocumentView_(&d->view);
+        d->view.drawBufs->flags |= updateSideBuf_DrawBufsFlag;
         postCommandf_Root(w->root,
                           "document.changed doc:%p status:%d url:%s",
                           d,
@@ -3093,7 +4128,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                           cstr_String(d->mod.url));
         /* Check for a pending goto. */
         if (!isEmpty_String(&d->pendingGotoHeading)) {
-            scrollToHeading_DocumentWidget_(d, cstr_String(&d->pendingGotoHeading));
+            scrollToHeading_DocumentView_(&d->view, cstr_String(&d->pendingGotoHeading));
             clear_String(&d->pendingGotoHeading);
         }
         cacheDocumentGlyphs_DocumentWidget_(d);
@@ -3102,6 +4137,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "document.translate") && d == document_App()) {
         if (!d->translation) {
             d->translation = new_Translation(d);
+            if (isUsingPanelLayout_Mobile()) {
+                const iRect safe = safeRect_Root(w->root);
+                d->translation->dlg->rect.pos = windowToLocal_Widget(w, zero_I2());
+                d->translation->dlg->rect.size = safe.size;
+            }
         }
         return iTrue;
     }
@@ -3117,14 +4157,19 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         if (findChild_Widget(root_Widget(w), "upload")) {
             return iTrue; /* already open */
         }
-        if (equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini") ||
-            equalCase_Rangecc(urlScheme_String(d->mod.url), "titan")) {
+        const iBool isGemini = equalCase_Rangecc(urlScheme_String(d->mod.url), "gemini");
+        if (isGemini || equalCase_Rangecc(urlScheme_String(d->mod.url), "titan")) {
             iUploadWidget *upload = new_UploadWidget();
             setUrl_UploadWidget(upload, d->mod.url);
             setResponseViewer_UploadWidget(upload, d);
             addChild_Widget(get_Root()->widget, iClob(upload));
-//            finalizeSheet_Mobile(as_Widget(upload));
             setupSheetTransition_Mobile(as_Widget(upload), iTrue);
+            if (argLabel_Command(cmd, "copy") && isUtf8_Rangecc(range_Block(&d->sourceContent))) {
+                iString text;
+                initBlock_String(&text, &d->sourceContent);
+                setText_UploadWidget(upload, &text);
+                deinit_String(&text);
+            }
             postRefresh_App();
         }
         return iTrue;
@@ -3135,7 +4180,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "media.player.started")) {
         /* When one media player starts, pause the others that may be playing. */
         const iPlayer *startedPlr = pointerLabel_Command(cmd, "player");
-        const iMedia * media  = media_GmDocument(d->doc);
+        const iMedia * media  = media_GmDocument(d->view.doc);
         const size_t   num    = numAudio_Media(media);
         for (size_t id = 1; id <= num; id++) {
             iPlayer *plr = audioPlayer_Media(media, (iMediaId){ audio_MediaType, id });
@@ -3167,22 +4212,37 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                                      "${dlg.save.incomplete}");
         }
         else if (!isEmpty_Block(&d->sourceContent)) {
-            const iBool    doOpen   = argLabel_Command(cmd, "open");
-            const iString *savePath = saveToDownloads_(d->mod.url, &d->sourceMime,
-                                                       &d->sourceContent, !doOpen);
-            if (!isEmpty_String(savePath) && doOpen) {
-                postCommandf_Root(
-                    w->root, "!open url:%s", cstrCollect_String(makeFileUrl_String(savePath)));
+            if (argLabel_Command(cmd, "extview")) {
+                if (equalCase_Rangecc(urlScheme_String(d->mod.url), "file")) {
+                    /* Already a file so just open it directly. */
+                    postCommandf_Root(w->root, "!open default:1 url:%s", cstr_String(d->mod.url));
+                }
+                else {
+                    const iString *tmpPath = temporaryPathForUrl_App(d->mod.url, &d->sourceMime);
+                    if (saveToFile_(tmpPath, &d->sourceContent, iFalse)) {
+                        postCommandf_Root(w->root, "!open default:1 url:%s",
+                                          cstrCollect_String(makeFileUrl_String(tmpPath)));
+                    }
+                }
+            }
+            else {
+                const iBool    doOpen   = argLabel_Command(cmd, "open");
+                const iString *savePath = saveToDownloads_(d->mod.url, &d->sourceMime,
+                                                           &d->sourceContent, !doOpen);
+                if (!isEmpty_String(savePath) && doOpen) {
+                    postCommandf_Root(
+                        w->root, "!open url:%s", cstrCollect_String(makeFileUrl_String(savePath)));
+                }
             }
         }
         return iTrue;
     }
     else if (equal_Command(cmd, "document.reload") && document_Command(cmd) == d) {
-        d->initNormScrollY = normScrollPos_DocumentWidget_(d);
+        d->initNormScrollY = normScrollPos_DocumentView_(&d->view);
         if (equalCase_Rangecc(urlScheme_String(d->mod.url), "titan")) {
             /* Reopen so the Upload dialog gets shown. */
             postCommandf_App("open url:%s", cstr_String(d->mod.url));
-            return iTrue;            
+            return iTrue;
         }
         fetch_DocumentWidget_(d);
         return iTrue;
@@ -3195,13 +4255,13 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             if (d->flags & showLinkNumbers_DocumentWidgetFlag &&
                 d->ordinalMode == homeRow_DocumentLinkOrdinalMode) {
                 const size_t numKeys = iElemCount(homeRowKeys_);
-                const iGmRun *last = lastVisibleLink_DocumentWidget_(d);
+                const iGmRun *last = lastVisibleLink_DocumentView_(&d->view);
                 if (!last) {
                     d->ordinalBase = 0;
                 }
                 else {
                     d->ordinalBase += numKeys;
-                    if (visibleLinkOrdinal_DocumentWidget_(d, last->linkId) < d->ordinalBase) {
+                    if (visibleLinkOrdinal_DocumentView_(&d->view, last->linkId) < d->ordinalBase) {
                         d->ordinalBase = 0;
                     }
                 }
@@ -3221,23 +4281,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             iChangeFlags(d->flags, newTabViaHomeKeys_DocumentWidgetFlag,
                          argLabel_Command(cmd, "newtab") != 0);
         }
-        invalidateVisibleLinks_DocumentWidget_(d);
+        invalidateVisibleLinks_DocumentView_(&d->view);
         refresh_Widget(d);
         return iTrue;
     }
     else if (equal_Command(cmd, "navigate.back") && document_App() == d) {
-        if (isPortraitPhone_App()) {
-            if (d->flags & openedFromSidebar_DocumentWidgetFlag &&
-                !isVisible_Widget(findWidget_App("sidebar"))) {
-                postCommand_App("sidebar.toggle");
-                showToolbar_Root(get_Root(), iTrue);
-#if defined (iPlatformAppleMobile)
-                playHapticEffect_iOS(gentleTap_HapticEffect);
-#endif
-                return iTrue;
-            }
-            d->flags &= ~openedFromSidebar_DocumentWidgetFlag;
-        }
         if (d->request) {
             postCommandf_Root(w->root,
                 "document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
@@ -3274,8 +4322,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equalWidget_Command(cmd, w, "scroll.moved")) {
-        init_Anim(&d->scrollY.pos, arg_Command(cmd));
-        updateVisible_DocumentWidget_(d);
+        init_Anim(&d->view.scrollY.pos, arg_Command(cmd));
+        updateVisible_DocumentView_(&d->view);
         return iTrue;
     }
     else if (equal_Command(cmd, "scroll.page") && document_App() == d) {
@@ -3286,25 +4334,26 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             return iTrue;
         }
         const float amount = argLabel_Command(cmd, "full") != 0 ? 1.0f : 0.5f;
-        smoothScroll_DocumentWidget_(d,
-                                     dir * amount * height_Rect(documentBounds_DocumentWidget_(d)),
-                                     smoothDuration_DocumentWidget_(keyboard_ScrollType));
+        smoothScroll_DocumentView_(&d->view,
+                                   dir * amount *
+                                       height_Rect(documentBounds_DocumentView_(&d->view)),
+                                   smoothDuration_DocumentWidget_(keyboard_ScrollType));
         return iTrue;
     }
     else if (equal_Command(cmd, "scroll.top") && document_App() == d) {
-        init_Anim(&d->scrollY.pos, 0);
-        invalidate_VisBuf(d->visBuf);
-        clampScroll_DocumentWidget_(d);
-        updateVisible_DocumentWidget_(d);
+        init_Anim(&d->view.scrollY.pos, 0);
+        invalidate_VisBuf(d->view.visBuf);
+        clampScroll_DocumentView_(&d->view);
+        updateVisible_DocumentView_(&d->view);
         refresh_Widget(w);
         return iTrue;
     }
     else if (equal_Command(cmd, "scroll.bottom") && document_App() == d) {
-        updateScrollMax_DocumentWidget_(d); /* scrollY.max might not be fully updated */
-        init_Anim(&d->scrollY.pos, d->scrollY.max);
-        invalidate_VisBuf(d->visBuf);
-        clampScroll_DocumentWidget_(d);
-        updateVisible_DocumentWidget_(d);
+        updateScrollMax_DocumentView_(&d->view); /* scrollY.max might not be fully updated */
+        init_Anim(&d->view.scrollY.pos, d->view.scrollY.max);
+        invalidate_VisBuf(d->view.visBuf);
+        clampScroll_DocumentView_(&d->view);
+        updateVisible_DocumentView_(&d->view);
         refresh_Widget(w);
         return iTrue;
     }
@@ -3315,9 +4364,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             fetchNextUnfetchedImage_DocumentWidget_(d)) {
             return iTrue;
         }
-        smoothScroll_DocumentWidget_(d,
-                                     3 * lineHeight_Text(paragraph_FontId) * dir,
-                                     smoothDuration_DocumentWidget_(keyboard_ScrollType));
+        smoothScroll_DocumentView_(&d->view,
+                                   3 * lineHeight_Text(paragraph_FontId) * dir,
+                                   smoothDuration_DocumentWidget_(keyboard_ScrollType));
         return iTrue;
     }
     else if (equal_Command(cmd, "document.goto") && document_App() == d) {
@@ -3328,13 +4377,13 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 setCStr_String(&d->pendingGotoHeading, heading);
                 return iTrue;
             }
-            scrollToHeading_DocumentWidget_(d, heading);
+            scrollToHeading_DocumentView_(&d->view, heading);
             return iTrue;
         }
         const char *loc = pointerLabel_Command(cmd, "loc");
-        const iGmRun *run = findRunAtLoc_GmDocument(d->doc, loc);
+        const iGmRun *run = findRunAtLoc_GmDocument(d->view.doc, loc);
         if (run) {
-            scrollTo_DocumentWidget_(d, run->visBounds.pos.y, iFalse);
+            scrollTo_DocumentView_(&d->view, run->visBounds.pos.y, iFalse);
         }
         return iTrue;
     }
@@ -3349,24 +4398,24 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         else {
             const iBool wrap = d->foundMark.start != NULL;
-            d->foundMark     = finder(d->doc, text_InputWidget(find), dir > 0 ? d->foundMark.end
+            d->foundMark     = finder(d->view.doc, text_InputWidget(find), dir > 0 ? d->foundMark.end
                                                                           : d->foundMark.start);
             if (!d->foundMark.start && wrap) {
                 /* Wrap around. */
-                d->foundMark = finder(d->doc, text_InputWidget(find), NULL);
+                d->foundMark = finder(d->view.doc, text_InputWidget(find), NULL);
             }
             if (d->foundMark.start) {
                 const iGmRun *found;
-                if ((found = findRunAtLoc_GmDocument(d->doc, d->foundMark.start)) != NULL) {
-                    scrollTo_DocumentWidget_(d, mid_Rect(found->bounds).y, iTrue);
+                if ((found = findRunAtLoc_GmDocument(d->view.doc, d->foundMark.start)) != NULL) {
+                    scrollTo_DocumentView_(&d->view, mid_Rect(found->bounds).y, iTrue);
                 }
             }
         }
         if (flags_Widget(w) & touchDrag_WidgetFlag) {
             postCommand_Root(w->root, "document.select arg:0"); /* we can't handle both at the same time */
         }
-        invalidateWideRunsWithNonzeroOffset_DocumentWidget_(d); /* markers don't support offsets */
-        resetWideRuns_DocumentWidget_(d);
+        invalidateWideRunsWithNonzeroOffset_DocumentView_(&d->view); /* markers don't support offsets */
+        resetWideRuns_DocumentView_(&d->view);
         refresh_Widget(w);
         return iTrue;
     }
@@ -3379,16 +4428,16 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equal_Command(cmd, "bookmark.links") && document_App() == d) {
         iPtrArray *links = collectNew_PtrArray();
-        render_GmDocument(d->doc, (iRangei){ 0, size_GmDocument(d->doc).y }, addAllLinks_, links);
+        render_GmDocument(d->view.doc, (iRangei){ 0, size_GmDocument(d->view.doc).y }, addAllLinks_, links);
         /* Find links that aren't already bookmarked. */
         iForEach(PtrArray, i, links) {
             const iGmRun *run = i.ptr;
             uint32_t      bmid;
             if ((bmid = findUrl_Bookmarks(bookmarks_App(),
-                                          linkUrl_GmDocument(d->doc, run->linkId))) != 0) {
+                                          linkUrl_GmDocument(d->view.doc, run->linkId))) != 0) {
                 const iBookmark *bm = get_Bookmarks(bookmarks_App(), bmid);
                 /* We can import local copies of remote bookmarks. */
-                if (!hasTag_Bookmark(bm, remote_BookmarkTag)) {
+                if (~bm->flags & remote_BookmarkFlag) {
                     remove_PtrArrayIterator(&i);
                 }
             }
@@ -3412,7 +4461,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 iConstForEach(PtrArray, j, links) {
                     const iGmRun *run = j.ptr;
                     add_Bookmarks(bookmarks_App(),
-                                  linkUrl_GmDocument(d->doc, run->linkId),
+                                  linkUrl_GmDocument(d->view.doc, run->linkId),
                                   collect_String(newRange_String(run->text)),
                                   NULL,
                                   0x1f588 /* pin */);
@@ -3427,7 +4476,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equalWidget_Command(cmd, w, "menu.closed")) {
-        updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), 0));
+        updateHover_DocumentView_(&d->view, mouseCoord_Window(get_Window(), 0));
     }
     else if (equal_Command(cmd, "document.autoreload")) {
         if (d->mod.reloadInterval) {
@@ -3485,7 +4534,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         if (argLabel_Command(cmd, "ttf")) {
             iAssert(!cmp_String(&d->sourceMime, "font/ttf"));
             installFontFile_Fonts(collect_String(suffix_Command(cmd, "name")), &d->sourceContent);
-            postCommand_App("open url:about:fonts");                
+            postCommand_App("open url:about:fonts");
         }
         else {
             const iString *id = idFromUrl_FontPack(d->mod.url);
@@ -3497,14 +4546,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     return iFalse;
 }
 
-static iRect runRect_DocumentWidget_(const iDocumentWidget *d, const iGmRun *run) {
-    const iRect docBounds = documentBounds_DocumentWidget_(d);
-    return moved_Rect(run->bounds, addY_I2(topLeft_Rect(docBounds), viewPos_DocumentWidget_(d)));
-}
-
 static void setGrabbedPlayer_DocumentWidget_(iDocumentWidget *d, const iGmRun *run) {
     if (run && run->mediaType == audio_MediaType) {
-        iPlayer *plr = audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(run));
+        iPlayer *plr = audioPlayer_Media(media_GmDocument(d->view.doc), mediaId_GmRun(run));
         setFlags_Player(plr, volumeGrabbed_PlayerFlag, iTrue);
         d->grabbedStartVolume = volume_Player(plr);
         d->grabbedPlayer      = run;
@@ -3512,7 +4556,7 @@ static void setGrabbedPlayer_DocumentWidget_(iDocumentWidget *d, const iGmRun *r
     }
     else if (d->grabbedPlayer) {
         setFlags_Player(
-            audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(d->grabbedPlayer)),
+            audioPlayer_Media(media_GmDocument(d->view.doc), mediaId_GmRun(d->grabbedPlayer)),
             volumeGrabbed_PlayerFlag,
             iFalse);
         d->grabbedPlayer = NULL;
@@ -3528,24 +4572,33 @@ static iBool processMediaEvents_DocumentWidget_(iDocumentWidget *d, const SDL_Ev
         ev->type != SDL_MOUSEMOTION) {
         return iFalse;
     }
-    if (ev->type == SDL_MOUSEBUTTONDOWN || ev->type == SDL_MOUSEBUTTONUP) {
-        if (ev->button.button != SDL_BUTTON_LEFT) {
-            return iFalse;
-        }
-    }
     if (d->grabbedPlayer) {
         /* Updated in the drag. */
         return iFalse;
     }
     const iInt2 mouse = init_I2(ev->button.x, ev->button.y);
-    iConstForEach(PtrArray, i, &d->visibleMedia) {
+    iConstForEach(PtrArray, i, &d->view.visibleMedia) {
         const iGmRun *run  = i.ptr;
+        if (run->mediaType == download_MediaType) {
+            iDownloadUI ui;
+            init_DownloadUI(&ui, media_GmDocument(d->view.doc), mediaId_GmRun(run).id,
+                            runRect_DocumentView_(&d->view, run));
+            if (processEvent_DownloadUI(&ui, ev)) {
+                return iTrue;
+            }
+            continue;
+        }
         if (run->mediaType != audio_MediaType) {
             continue;
         }
+        if (ev->type == SDL_MOUSEBUTTONDOWN || ev->type == SDL_MOUSEBUTTONUP) {
+            if (ev->button.button != SDL_BUTTON_LEFT) {
+                return iFalse;
+            }
+        }
         /* TODO: move this to mediaui.c */
-        const iRect rect = runRect_DocumentWidget_(d, run);
-        iPlayer *   plr  = audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(run));
+        const iRect rect = runRect_DocumentView_(&d->view, run);
+        iPlayer *   plr  = audioPlayer_Media(media_GmDocument(d->view.doc), mediaId_GmRun(run));
         if (contains_Rect(rect, mouse)) {
             iPlayerUI ui;
             init_PlayerUI(&ui, plr, rect);
@@ -3610,83 +4663,140 @@ static iBool processMediaEvents_DocumentWidget_(iDocumentWidget *d, const SDL_Ev
     return iFalse;
 }
 
-static size_t linkOrdinalFromKey_DocumentWidget_(const iDocumentWidget *d, int key) {
-    size_t ord = iInvalidPos;
-    if (d->ordinalMode == numbersAndAlphabet_DocumentLinkOrdinalMode) {
-        if (key >= '1' && key <= '9') {
-            return key - '1';
-        }
-        if (key < 'a' || key > 'z') {
-            return iInvalidPos;
-        }
-        ord = key - 'a' + 9;
-#if defined (iPlatformApple)
-        /* Skip keys that would conflict with default system shortcuts: hide, minimize, quit, close. */
-        if (key == 'h' || key == 'm' || key == 'q' || key == 'w') {
-            return iInvalidPos;
-        }
-        if (key > 'h') ord--;
-        if (key > 'm') ord--;
-        if (key > 'q') ord--;
-        if (key > 'w') ord--;
-#endif
+static void beginMarkingSelection_DocumentWidget_(iDocumentWidget *d, iInt2 pos) {
+    setFocus_Widget(NULL); /* TODO: Focus this document? */
+    invalidateWideRunsWithNonzeroOffset_DocumentView_(&d->view);
+    resetWideRuns_DocumentView_(&d->view); /* Selections don't support horizontal scrolling. */
+    iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iTrue);
+    d->initialSelectMark = d->selectMark = sourceLoc_DocumentView_(&d->view, pos);
+    refresh_Widget(as_Widget(d));
+}
+
+static void interactingWithLink_DocumentWidget_(iDocumentWidget *d, iGmLinkId id) {
+    iRangecc loc = linkUrlRange_GmDocument(d->view.doc, id);
+    if (!loc.start) {
+        clear_String(&d->linePrecedingLink);
+        return;
     }
-    else {
-        iForIndices(i, homeRowKeys_) {
-            if (homeRowKeys_[i] == key) {
-                return i;
-            }
-        }
+    d->requestLinkId = id;
+    const char *start = range_String(source_GmDocument(d->view.doc)).start;
+    /* Find the preceding line. This is offered as a prefill option for a possible input query. */
+    while (loc.start > start && *loc.start != '\n') {
+        loc.start--;
     }
-    return ord;
+    loc.end = loc.start; /* End of the preceding line. */
+    if (loc.start > start) {
+        loc.start--;
+    }
+    while (loc.start > start && *loc.start != '\n') {
+        loc.start--;
+    }
+    if (*loc.start == '\n') {
+        loc.start++; /* Start of the preceding line. */
+    }
+    setRange_String(&d->linePrecedingLink, loc);
 }
 
-static iChar linkOrdinalChar_DocumentWidget_(const iDocumentWidget *d, size_t ord) {
-    if (d->ordinalMode == numbersAndAlphabet_DocumentLinkOrdinalMode) {
-        if (ord < 9) {
-            return '1' + ord;
-        }
-#if defined (iPlatformApple)
-        if (ord < 9 + 22) {
-            int key = 'a' + ord - 9;
-            if (key >= 'h') key++;
-            if (key >= 'm') key++;
-            if (key >= 'q') key++;
-            if (key >= 'w') key++;
-            return 'A' + key - 'a';
-        }
-#else
-        if (ord < 9 + 26) {
-            return 'A' + ord - 9;
-        }
-#endif
-    }
-    else {
-        if (ord < iElemCount(homeRowKeys_)) {
-            return 'A' + homeRowKeys_[ord] - 'a';
+iLocalDef int wheelSwipeSide_DocumentWidget_(const iDocumentWidget *d) {
+    return (d->flags & rightWheelSwipe_DocumentWidgetFlag  ? 2
+            : d->flags & leftWheelSwipe_DocumentWidgetFlag ? 1
+                                                           : 0);
+}
+
+static void finishWheelSwipe_DocumentWidget_(iDocumentWidget *d) {
+    if (d->flags & eitherWheelSwipe_DocumentWidgetFlag &&
+        d->wheelSwipeState == direct_WheelSwipeState) {
+        const int side = wheelSwipeSide_DocumentWidget_(d);
+        int abort = ((side == 1 && d->swipeSpeed < 0) || (side == 2 && d->swipeSpeed > 0));
+        if (iAbs(d->wheelSwipeDistance) < width_Widget(d) / 4 && iAbs(d->swipeSpeed) < 4 * gap_UI) {
+            abort = 1;
         }
+        postCommand_Widget(d, "edgeswipe.ended side:%d abort:%d", side, abort);
+        d->flags &= ~eitherWheelSwipe_DocumentWidgetFlag;
     }
-    return 0;
 }
 
-static void beginMarkingSelection_DocumentWidget_(iDocumentWidget *d, iInt2 pos) {
-    setFocus_Widget(NULL); /* TODO: Focus this document? */
-    invalidateWideRunsWithNonzeroOffset_DocumentWidget_(d);
-    resetWideRuns_DocumentWidget_(d); /* Selections don't support horizontal scrolling. */
-    iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iTrue);
-    d->initialSelectMark = d->selectMark = sourceLoc_DocumentWidget_(d, pos);
-    refresh_Widget(as_Widget(d));
+static iBool handleWheelSwipe_DocumentWidget_(iDocumentWidget *d, const SDL_MouseWheelEvent *ev) {
+    iWidget *w = as_Widget(d);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        return iFalse;
+    }
+    if (~flags_Widget(w) & horizontalOffset_WidgetFlag) {
+        return iFalse;
+    }
+    iAssert(~d->flags & animationPlaceholder_DocumentWidgetFlag);
+//    printf("STATE:%d wheel x:%d inert:%d end:%d\n", d->wheelSwipeState,
+//           ev->x, isInertia_MouseWheelEvent(ev),
+//           isScrollFinished_MouseWheelEvent(ev));
+//    fflush(stdout);
+    switch (d->wheelSwipeState) {
+        case none_WheelSwipeState:
+            /* A new swipe starts. */
+            if (!isInertia_MouseWheelEvent(ev) && !isScrollFinished_MouseWheelEvent(ev)) {
+                int side = ev->x > 0 ? 1 : 2;
+                d->wheelSwipeDistance = ev->x * 2;
+                d->flags &= ~eitherWheelSwipe_DocumentWidgetFlag;
+                d->flags |= (side == 1 ? leftWheelSwipe_DocumentWidgetFlag
+                                       : rightWheelSwipe_DocumentWidgetFlag);
+                //        printf("swipe starts at %d, side %d\n", d->wheelSwipeDistance, side);
+                d->wheelSwipeState = direct_WheelSwipeState;
+                d->swipeSpeed = 0;
+                postCommand_Widget(d, "edgeswipe.moved arg:%d side:%d", d->wheelSwipeDistance, side);
+                return iTrue;
+            }
+            break;
+        case direct_WheelSwipeState:
+            if (isInertia_MouseWheelEvent(ev) || isScrollFinished_MouseWheelEvent(ev)) {
+                finishWheelSwipe_DocumentWidget_(d);
+                d->wheelSwipeState = none_WheelSwipeState;
+            }
+            else {
+                int step = ev->x * 2;
+                d->wheelSwipeDistance += step;
+                /* Remember the maximum speed. */
+                if (d->swipeSpeed < 0 && step < 0) {
+                    d->swipeSpeed = iMin(d->swipeSpeed, step);
+                }
+                else if (d->swipeSpeed > 0 && step > 0) {
+                    d->swipeSpeed = iMax(d->swipeSpeed, step);
+                }
+                else {
+                    d->swipeSpeed = step;
+                }
+                switch (wheelSwipeSide_DocumentWidget_(d)) {
+                    case 1:
+                        d->wheelSwipeDistance = iMax(0, d->wheelSwipeDistance);
+                        d->wheelSwipeDistance = iMin(width_Widget(d), d->wheelSwipeDistance);
+                        break;
+                    case 2:
+                        d->wheelSwipeDistance = iMin(0, d->wheelSwipeDistance);
+                        d->wheelSwipeDistance = iMax(-width_Widget(d), d->wheelSwipeDistance);
+                        break;
+                }
+                /* TODO: calculate speed, rememeber direction */
+                //printf("swipe moved to %d, side %d\n", d->wheelSwipeDistance, side);
+                postCommand_Widget(d, "edgeswipe.moved arg:%d side:%d", d->wheelSwipeDistance,
+                                   wheelSwipeSide_DocumentWidget_(d));
+            }
+            return iTrue;
+    }
+    return iFalse;
 }
 
 static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *ev) {
-    iWidget *w = as_Widget(d);
+    iWidget       *w    = as_Widget(d);
+    iDocumentView *view = &d->view;
     if (isMetricsChange_UserEvent(ev)) {
         updateSize_DocumentWidget(d);
     }
-    else if (processEvent_SmoothScroll(&d->scrollY, ev)) {
+    else if (processEvent_SmoothScroll(&d->view.scrollY, ev)) {
         return iTrue;
     }
     else if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
+        if (isCommand_Widget(w, ev, "pullaction")) {
+            postCommand_Widget(w, "navigate.reload");
+            return iTrue;
+        }
         if (!handleCommand_DocumentWidget_(d, command_UserEvent(ev))) {
             /* Base class commands. */
             return processEvent_Widget(w, ev);
@@ -3698,27 +4808,28 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         if ((d->flags & showLinkNumbers_DocumentWidgetFlag) &&
             ((key >= '1' && key <= '9') || (key >= 'a' && key <= 'z'))) {
             const size_t ord = linkOrdinalFromKey_DocumentWidget_(d, key) + d->ordinalBase;
-            iConstForEach(PtrArray, i, &d->visibleLinks) {
+            iConstForEach(PtrArray, i, &d->view.visibleLinks) {
                 if (ord == iInvalidPos) break;
                 const iGmRun *run = i.ptr;
                 if (run->flags & decoration_GmRunFlag &&
-                    visibleLinkOrdinal_DocumentWidget_(d, run->linkId) == ord) {
+                    visibleLinkOrdinal_DocumentView_(view, run->linkId) == ord) {
                     if (d->flags & setHoverViaKeys_DocumentWidgetFlag) {
-                        d->hoverLink = run;
+                        view->hoverLink = run;
                     }
                     else {
-                        postCommandf_Root(w->root,
-                                          "open newtab:%d url:%s",
-                                          (isPinned_DocumentWidget_(d) ? otherRoot_OpenTabFlag : 0) ^
-                                          (d->ordinalMode ==
-                                                 numbersAndAlphabet_DocumentLinkOrdinalMode
-                                             ? openTabMode_Sym(modState_Keys())
-                                             : (d->flags & newTabViaHomeKeys_DocumentWidgetFlag ? 1 : 0)),
-                                          cstr_String(absoluteUrl_String(
-                                             d->mod.url, linkUrl_GmDocument(d->doc, run->linkId))));
+                        postCommandf_Root(
+                            w->root,
+                            "open newtab:%d url:%s",
+                            (isPinned_DocumentWidget_(d) ? otherRoot_OpenTabFlag : 0) ^
+                                (d->ordinalMode == numbersAndAlphabet_DocumentLinkOrdinalMode
+                                     ? openTabMode_Sym(modState_Keys())
+                                     : (d->flags & newTabViaHomeKeys_DocumentWidgetFlag ? 1 : 0)),
+                            cstr_String(absoluteUrl_String(
+                                d->mod.url, linkUrl_GmDocument(view->doc, run->linkId))));
+                        interactingWithLink_DocumentWidget_(d, run->linkId);
                     }
                     setLinkNumberMode_DocumentWidget_(d, iFalse);
-                    invalidateVisibleLinks_DocumentWidget_(d);
+                    invalidateVisibleLinks_DocumentView_(view);
                     refresh_Widget(d);
                     return iTrue;
                 }
@@ -3728,7 +4839,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             case SDLK_ESCAPE:
                 if (d->flags & showLinkNumbers_DocumentWidgetFlag && document_App() == d) {
                     setLinkNumberMode_DocumentWidget_(d, iFalse);
-                    invalidateVisibleLinks_DocumentWidget_(d);
+                    invalidateVisibleLinks_DocumentView_(view);
                     refresh_Widget(d);
                     return iTrue;
                 }
@@ -3740,7 +4851,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 for (size_t i = 0; i < 64; ++i) {
                     setByte_Block(seed, i, iRandom(0, 256));
                 }
-                setThemeSeed_GmDocument(d->doc, seed);
+                setThemeSeed_GmDocument(view->doc, seed);
                 delete_Block(seed);
                 invalidate_DocumentWidget_(d);
                 refresh_Widget(w);
@@ -3770,13 +4881,24 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
 #endif
         }
     }
+#if defined (iPlatformAppleDesktop)
+    else if (ev->type == SDL_MOUSEWHEEL &&
+             ev->wheel.y == 0 &&
+             d->wheelSwipeState == direct_WheelSwipeState &&
+             handleWheelSwipe_DocumentWidget_(d, &ev->wheel)) {
+        return iTrue;
+    }
+#endif
     else if (ev->type == SDL_MOUSEWHEEL && isHover_Widget(w)) {
         const iInt2 mouseCoord = coord_MouseWheelEvent(&ev->wheel);
         if (isPerPixel_MouseWheelEvent(&ev->wheel)) {
             const iInt2 wheel = init_I2(ev->wheel.x, ev->wheel.y);
-            stop_Anim(&d->scrollY.pos);
-            immediateScroll_DocumentWidget_(d, -wheel.y);
-            scrollWideBlock_DocumentWidget_(d, mouseCoord, -wheel.x, 0);
+            stop_Anim(&d->view.scrollY.pos);
+            immediateScroll_DocumentView_(view, -wheel.y);
+            if (!scrollWideBlock_DocumentView_(view, mouseCoord, -wheel.x, 0) &&
+                wheel.x) {
+                handleWheelSwipe_DocumentWidget_(d, &ev->wheel);
+            }
         }
         else {
             /* Traditional mouse wheel. */
@@ -3785,16 +4907,11 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 postCommandf_App("zoom.delta arg:%d", amount > 0 ? 10 : -10);
                 return iTrue;
             }
-            smoothScroll_DocumentWidget_(
-                d,
-                -3 * amount * lineHeight_Text(paragraph_FontId),
-                smoothDuration_DocumentWidget_(mouse_ScrollType)); 
-                    /* accelerated speed for repeated wheelings */
-//                    * (!isFinished_SmoothScroll(&d->scrollY) && pos_Anim(&d->scrollY.pos) < 0.25f
-//                         ? 0.5f
-//                         : 1.0f));
-            scrollWideBlock_DocumentWidget_(
-                d, mouseCoord, -3 * ev->wheel.x * lineHeight_Text(paragraph_FontId), 167);
+            smoothScroll_DocumentView_(view,
+                                       -3 * amount * lineHeight_Text(paragraph_FontId),
+                                       smoothDuration_DocumentWidget_(mouse_ScrollType));
+            scrollWideBlock_DocumentView_(
+                view, mouseCoord, -3 * ev->wheel.x * lineHeight_Text(paragraph_FontId), 167);
         }
         iChangeFlags(d->flags, noHoverWhileScrolling_DocumentWidgetFlag, iTrue);
         return iTrue;
@@ -3813,16 +4930,19 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
 #endif
         else {
-            if (value_Anim(&d->altTextOpacity) < 0.833f) {
-                setValue_Anim(&d->altTextOpacity, 0, 0); /* keep it hidden while moving */
+            if (value_Anim(&view->altTextOpacity) < 0.833f) {
+                setValue_Anim(&view->altTextOpacity, 0, 0); /* keep it hidden while moving */
             }
-            updateHover_DocumentWidget_(d, mpos);
+            updateHover_DocumentView_(view, mpos);
         }
     }
     if (ev->type == SDL_USEREVENT && ev->user.code == widgetTapBegins_UserEventCode) {
         iChangeFlags(d->flags, noHoverWhileScrolling_DocumentWidgetFlag, iFalse);
         return iTrue;
     }
+    if (processMediaEvents_DocumentWidget_(d, ev)) {
+        return iTrue;
+    }
     if (ev->type == SDL_MOUSEBUTTONDOWN) {
         if (ev->button.button == SDL_BUTTON_X1) {
             postCommand_Root(w->root, "navigate.back");
@@ -3832,17 +4952,18 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             postCommand_Root(w->root, "navigate.forward");
             return iTrue;
         }
-        if (ev->button.button == SDL_BUTTON_MIDDLE && d->hoverLink) {
+        if (ev->button.button == SDL_BUTTON_MIDDLE && view->hoverLink) {
+            interactingWithLink_DocumentWidget_(d, view->hoverLink->linkId);
             postCommandf_Root(w->root, "open newtab:%d url:%s",
                               (isPinned_DocumentWidget_(d) ? otherRoot_OpenTabFlag : 0) |
                               (modState_Keys() & KMOD_SHIFT ? new_OpenTabFlag : newBackground_OpenTabFlag),
-                              cstr_String(linkUrl_GmDocument(d->doc, d->hoverLink->linkId)));
+                              cstr_String(linkUrl_GmDocument(view->doc, view->hoverLink->linkId)));
             return iTrue;
         }
         if (ev->button.button == SDL_BUTTON_RIGHT &&
             contains_Widget(w, init_I2(ev->button.x, ev->button.y))) {
             if (!isVisible_Widget(d->menu)) {
-                d->contextLink = d->hoverLink;
+                d->contextLink = view->hoverLink;
                 d->contextPos = init_I2(ev->button.x, ev->button.y);
                 if (d->menu) {
                     destroy_Widget(d->menu);
@@ -3853,15 +4974,18 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 init_Array(&items, sizeof(iMenuItem));
                 if (d->contextLink) {
                     /* Context menu for a link. */
-                    const iString *linkUrl  = linkUrl_GmDocument(d->doc, d->contextLink->linkId);
+                    interactingWithLink_DocumentWidget_(d, d->contextLink->linkId); /* perhaps will be triggered */
+                    const iString *linkUrl  = linkUrl_GmDocument(view->doc, d->contextLink->linkId);
 //                    const int      linkFlags = linkFlags_GmDocument(d->doc, d->contextLink->linkId);
                     const iRangecc scheme   = urlScheme_String(linkUrl);
                     const iBool    isGemini = equalCase_Rangecc(scheme, "gemini");
                     iBool          isNative = iFalse;
                     if (deviceType_App() != desktop_AppDeviceType) {
                         /* Show the link as the first, non-interactive item. */
+                        iString *infoText = collectNew_String();
+                        infoText_LinkInfo(d->view.doc, d->contextLink->linkId, infoText);
                         pushBack_Array(&items, &(iMenuItem){
-                            format_CStr("```%s", cstr_String(linkUrl)),
+                            format_CStr("```%s", cstr_String(infoText)),
                             0, 0, NULL });
                     }
                     if (willUseProxy_App(scheme) || isGemini ||
@@ -3872,27 +4996,59 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         /* Regular links that we can open. */
                         pushBackN_Array(
                             &items,
-                            (iMenuItem[]){
-                                { openTab_Icon " ${link.newtab}",
-                                  0,
-                                  0,
-                                  format_CStr("!open newtab:1 url:%s", cstr_String(linkUrl)) },
-                                { openTabBg_Icon " ${link.newtab.background}",
-                                  0,
-                                  0,
-                                  format_CStr("!open newtab:2 url:%s", cstr_String(linkUrl)) },
-                                { "${link.side}",
-                                  0,
-                                  0,
-                                  format_CStr("!open newtab:4 url:%s", cstr_String(linkUrl)) },
-                                { "${link.side.newtab}",
-                                  0,
-                                  0,
-                                  format_CStr("!open newtab:5 url:%s", cstr_String(linkUrl)) } },
+                            (iMenuItem[]){ { openTab_Icon " ${link.newtab}",
+                                             0,
+                                             0,
+                                             format_CStr("!open newtab:1 origin:%s url:%s",
+                                                         cstr_String(id_Widget(w)),
+                                                         cstr_String(linkUrl)) },
+                                           { openTabBg_Icon " ${link.newtab.background}",
+                                             0,
+                                             0,
+                                             format_CStr("!open newtab:2 origin:%s url:%s",
+                                                         cstr_String(id_Widget(w)),
+                                                         cstr_String(linkUrl)) },
+                                           { "${link.side}",
+                                             0,
+                                             0,
+                                             format_CStr("!open newtab:4 origin:%s url:%s",
+                                                         cstr_String(id_Widget(w)),
+                                                         cstr_String(linkUrl)) },
+                                           { "${link.side.newtab}",
+                                             0,
+                                             0,
+                                             format_CStr("!open newtab:5 origin:%s url:%s",
+                                                         cstr_String(id_Widget(w)),
+                                                         cstr_String(linkUrl)) } },
                             4);
                         if (deviceType_App() == phone_AppDeviceType) {
                             removeN_Array(&items, size_Array(&items) - 2, iInvalidSize);
                         }
+                        if (equalCase_Rangecc(scheme, "file")) {
+                            pushBack_Array(&items, &(iMenuItem){ "---" });
+                            pushBack_Array(&items,
+                                           &(iMenuItem){ export_Icon " ${menu.open.external}",
+                                                         0,
+                                                         0,
+                                                         format_CStr("!open default:1 url:%s",
+                                                                     cstr_String(linkUrl)) });
+#if defined (iPlatformAppleDesktop)
+                            pushBack_Array(&items,
+                                           &(iMenuItem){ "${menu.reveal.macos}",
+                                                         0,
+                                                         0,
+                                                         format_CStr("!reveal url:%s",
+                                                                     cstr_String(linkUrl)) });
+#endif
+#if defined (iPlatformLinux)
+                            pushBack_Array(&items,
+                                           &(iMenuItem){ "${menu.reveal.filemgr}",
+                                                         0,
+                                                         0,
+                                                         format_CStr("!reveal url:%s",
+                                                                     cstr_String(linkUrl)) });
+#endif
+                        }
                     }
                     else if (!willUseProxy_App(scheme)) {
                         pushBack_Array(
@@ -3910,11 +5066,13 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                 { isGemini ? "${link.noproxy}" : openExt_Icon " ${link.browser}",
                                   0,
                                   0,
-                                  format_CStr("!open noproxy:1 url:%s", cstr_String(linkUrl)) } },
+                                  format_CStr("!open origin:%s noproxy:1 url:%s",
+                                              cstr_String(id_Widget(w)),
+                                              cstr_String(linkUrl)) } },
                             2);
                     }
                     iString *linkLabel = collectNewRange_String(
-                        linkLabel_GmDocument(d->doc, d->contextLink->linkId));
+                        linkLabel_GmDocument(view->doc, d->contextLink->linkId));
                     urlEncodeSpaces_String(linkLabel);
                     pushBackN_Array(&items,
                                     (iMenuItem[]){ { "---" },
@@ -3927,7 +5085,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                                                  cstr_String(linkUrl)) },
                                                    },
                                     3);
-                    if (isNative && d->contextLink->mediaType != download_MediaType) {
+                    if (isNative && d->contextLink->mediaType != download_MediaType &&
+                        !equalCase_Rangecc(scheme, "file")) {
                         pushBackN_Array(&items, (iMenuItem[]){
                             { "---" },
                             { download_Icon " ${link.download}", 0, 0, "document.downloadlink" },
@@ -3947,6 +5106,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     }
                     if (equalCase_Rangecc(scheme, "file")) {
                         /* Local files may be deleted. */
+                        pushBack_Array(&items, &(iMenuItem){ "---" });
                         pushBack_Array(
                             &items,
                             &(iMenuItem){ delete_Icon " " uiTextCaution_ColorEscape
@@ -3982,9 +5142,10 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                             { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
                             { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
+                            { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" },
                             { "---" },
                             { "${menu.page.copyurl}", 0, 0, "document.copylink" } },
-                        16);
+                        17);
                     if (isEmpty_Range(&d->selectMark)) {
                         pushBackN_Array(
                             &items,
@@ -4020,9 +5181,6 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             processContextMenuEvent_Widget(d->menu, ev, {});
         }
     }
-    if (processMediaEvents_DocumentWidget_(d, ev)) {
-        return iTrue;
-    }
     if (processEvent_Banner(d->banner, ev)) {
         return iTrue;
     }
@@ -4035,7 +5193,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             /* Enable hover state now that scrolling has surely finished. */
             if (d->flags & noHoverWhileScrolling_DocumentWidgetFlag) {
                 d->flags &= ~noHoverWhileScrolling_DocumentWidgetFlag;
-                updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window(), ev->button.which));
+                updateHover_DocumentView_(view, mouseCoord_Window(get_Window(), ev->button.which));
             }
             if (~flags_Widget(w) & touchDrag_WidgetFlag) {
                 iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iFalse);
@@ -4046,7 +5204,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     beginMarkingSelection_DocumentWidget_(d, d->click.startPos);
                     extendRange_Rangecc(
                         &d->selectMark,
-                        range_String(source_GmDocument(d->doc)),
+                        range_String(source_GmDocument(view->doc)),
                         bothStartAndEnd_RangeExtension |
                             (d->click.count == 2 ? word_RangeExtension : line_RangeExtension));
                     d->initialSelectMark = d->selectMark;
@@ -4060,24 +5218,24 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         case drag_ClickResult: {
             if (d->grabbedPlayer) {
                 iPlayer *plr =
-                    audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(d->grabbedPlayer));
+                    audioPlayer_Media(media_GmDocument(view->doc), mediaId_GmRun(d->grabbedPlayer));
                 iPlayerUI ui;
-                init_PlayerUI(&ui, plr, runRect_DocumentWidget_(d, d->grabbedPlayer));
+                init_PlayerUI(&ui, plr, runRect_DocumentView_(view, d->grabbedPlayer));
                 float off = (float) delta_Click(&d->click).x / (float) width_Rect(ui.volumeSlider);
                 setVolume_Player(plr, d->grabbedStartVolume + off);
                 refresh_Widget(w);
                 return iTrue;
             }
             /* Fold/unfold a preformatted block. */
-            if (~d->flags & selecting_DocumentWidgetFlag && d->hoverPre &&
-                preIsFolded_GmDocument(d->doc, preId_GmRun(d->hoverPre))) {
+            if (~d->flags & selecting_DocumentWidgetFlag && view->hoverPre &&
+                preIsFolded_GmDocument(view->doc, preId_GmRun(view->hoverPre))) {
                 return iTrue;
             }
             /* Begin selecting a range of text. */
             if (~d->flags & selecting_DocumentWidgetFlag) {
                 beginMarkingSelection_DocumentWidget_(d, d->click.startPos);
             }
-            iRangecc loc = sourceLoc_DocumentWidget_(d, pos_Click(&d->click));
+            iRangecc loc = sourceLoc_DocumentView_(view, pos_Click(&d->click));
             if (d->selectMark.start == NULL) {
                 d->selectMark = loc;
             }
@@ -4088,7 +5246,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                       movingSelectMarkEnd_DocumentWidgetFlag))) {
                         const iRangecc mark    = selectMark_DocumentWidget_(d);
                         const char *   midMark = mark.start + size_Range(&mark) / 2;
-                        const iRangecc loc     = sourceLoc_DocumentWidget_(d, pos_Click(&d->click));
+                        const iRangecc loc     = sourceLoc_DocumentView_(view, pos_Click(&d->click));
                         const iBool    isCloserToStart = d->selectMark.start > d->selectMark.end ?
                             (loc.start > midMark) : (loc.start < midMark);
                         iChangeFlags(d->flags, movingSelectMarkStart_DocumentWidgetFlag, isCloserToStart);
@@ -4118,7 +5276,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             if (d->flags & (selectWords_DocumentWidgetFlag | selectLines_DocumentWidgetFlag)) {
                 extendRange_Rangecc(
                     &d->selectMark,
-                    range_String(source_GmDocument(d->doc)),
+                    range_String(source_GmDocument(view->doc)),
                     (d->flags & movingSelectMarkStart_DocumentWidgetFlag ? moveStart_RangeExtension
                                                                          : moveEnd_RangeExtension) |
                         (d->flags & selectWords_DocumentWidgetFlag ? word_RangeExtension
@@ -4156,7 +5314,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 setFocus_Widget(NULL);
                 /* Tap in tap selection mode. */
                 if (flags_Widget(w) & touchDrag_WidgetFlag) {
-                    const iRangecc tapLoc = sourceLoc_DocumentWidget_(d, pos_Click(&d->click));
+                    const iRangecc tapLoc = sourceLoc_DocumentView_(view, pos_Click(&d->click));
                     /* Tapping on the selection will show a menu. */
                     const iRangecc mark = selectMark_DocumentWidget_(d);
                     if (tapLoc.start >= mark.start && tapLoc.end <= mark.end) {
@@ -4165,11 +5323,15 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             destroy_Widget(d->copyMenu);
                             d->copyMenu = NULL;
                         }
-                        d->copyMenu = makeMenu_Widget(w, (iMenuItem[]){
+                        const iMenuItem items[] = {
                             { clipCopy_Icon " ${menu.copy}", 0, 0, "copy" },
+#if defined (iPlatformAppleMobile)
+                            { export_Icon " ${menu.share}", 0, 0, "copy share:1" },
+#endif
                             { "---" },
                             { close_Icon " ${menu.select.clear}", 0, 0, "document.select arg:0" },
-                        }, 3);
+                        };
+                        d->copyMenu = makeMenu_Widget(w, items, iElemCount(items));
                         setFlags_Widget(d->copyMenu, noFadeBackground_WidgetFlag, iTrue);
                         openMenu_Widget(d->copyMenu, pos_Click(&d->click));
                         return iTrue;
@@ -4180,18 +5342,18 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         return iTrue;
                     }
                 }
-                if (d->hoverPre) {
-                    togglePreFold_DocumentWidget_(d, preId_GmRun(d->hoverPre));
+                if (view->hoverPre) {
+                    togglePreFold_DocumentWidget_(d, preId_GmRun(view->hoverPre));
                     return iTrue;
                 }
-                if (d->hoverLink) {
+                if (view->hoverLink) {
                     /* TODO: Move this to a method. */
-                    const iGmLinkId linkId    = d->hoverLink->linkId;
-                    const iMediaId  linkMedia = mediaId_GmRun(d->hoverLink);
-                    const int       linkFlags = linkFlags_GmDocument(d->doc, linkId);
+                    const iGmLinkId linkId    = view->hoverLink->linkId;
+                    const iMediaId  linkMedia = mediaId_GmRun(view->hoverLink);
+                    const int       linkFlags = linkFlags_GmDocument(view->doc, linkId);
                     iAssert(linkId);
                     /* Media links are opened inline by default. */
-                    if (isMediaLink_GmDocument(d->doc, linkId)) {
+                    if (isMediaLink_GmDocument(view->doc, linkId)) {
                         if (linkFlags & content_GmLinkFlag && linkFlags & permanent_GmLinkFlag) {
                             /* We have the content and it cannot be dismissed, so nothing
                                further to do. */
@@ -4200,7 +5362,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         if (!requestMedia_DocumentWidget_(d, linkId, iTrue)) {
                             if (linkFlags & content_GmLinkFlag) {
                                 /* Dismiss shown content on click. */
-                                setData_Media(media_GmDocument(d->doc),
+                                setData_Media(media_GmDocument(view->doc),
                                               linkId,
                                               NULL,
                                               NULL,
@@ -4214,10 +5376,10 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                            be redone. */
                                     }
                                 }
-                                redoLayout_GmDocument(d->doc);
-                                d->hoverLink = NULL;
-                                clampScroll_DocumentWidget_(d);
-                                updateVisible_DocumentWidget_(d);
+                                redoLayout_GmDocument(view->doc);
+                                view->hoverLink = NULL;
+                                clampScroll_DocumentView_(view);
+                                updateVisible_DocumentView_(view);
                                 invalidate_DocumentWidget_(d);
                                 refresh_Widget(w);
                                 return iTrue;
@@ -4226,13 +5388,13 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                 /* Show the existing content again if we have it. */
                                 iMediaRequest *req = findMediaRequest_DocumentWidget_(d, linkId);
                                 if (req) {
-                                    setData_Media(media_GmDocument(d->doc),
+                                    setData_Media(media_GmDocument(view->doc),
                                                   linkId,
                                                   meta_GmRequest(req->req),
                                                   body_GmRequest(req->req),
                                                   allowHide_MediaFlag);
-                                    redoLayout_GmDocument(d->doc);
-                                    updateVisible_DocumentWidget_(d);
+                                    redoLayout_GmDocument(view->doc);
+                                    updateVisible_DocumentView_(view);
                                     invalidate_DocumentWidget_(d);
                                     refresh_Widget(w);
                                     return iTrue;
@@ -4252,14 +5414,15 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         if (isPinned_DocumentWidget_(d)) {
                             tabMode ^= otherRoot_OpenTabFlag;
                         }
+                        interactingWithLink_DocumentWidget_(d, linkId);
                         postCommandf_Root(w->root, "open newtab:%d url:%s",
                                          tabMode,
                                          cstr_String(absoluteUrl_String(
-                                             d->mod.url, linkUrl_GmDocument(d->doc, linkId))));
+                                             d->mod.url, linkUrl_GmDocument(view->doc, linkId))));
                     }
                     else {
                         const iString *url = absoluteUrl_String(
-                            d->mod.url, linkUrl_GmDocument(d->doc, linkId));
+                            d->mod.url, linkUrl_GmDocument(view->doc, linkId));
                         makeQuestion_Widget(
                             uiTextCaution_ColorEscape "${heading.openlink}",
                             format_CStr(
@@ -4292,705 +5455,18 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
     return processEvent_Widget(w, ev);
 }
 
-iDeclareType(DrawContext)
-
-struct Impl_DrawContext {
-    const iDocumentWidget *widget;
-    iRect widgetBounds;
-    iRect docBounds;
-    iRangei vis;
-    iInt2 viewPos; /* document area origin */
-    iPaint paint;
-    iBool inSelectMark;
-    iBool inFoundMark;
-    iBool showLinkNumbers;
-    iRect firstMarkRect;
-    iRect lastMarkRect;
-    iGmRunRange runsDrawn;
-};
-
-static void fillRange_DrawContext_(iDrawContext *d, const iGmRun *run, enum iColorId color,
-                                   iRangecc mark, iBool *isInside) {
-    if (mark.start > mark.end) {
-        /* Selection may be done in either direction. */
-        iSwap(const char *, mark.start, mark.end);
-    }
-    if (*isInside || (contains_Range(&run->text, mark.start) ||
-                      contains_Range(&mark, run->text.start))) {
-        int x = 0;
-        if (!*isInside) {
-            x = measureRange_Text(run->font,
-                                  (iRangecc){ run->text.start, iMax(run->text.start, mark.start) })
-                    .advance.x;
-        }
-        int w = width_Rect(run->visBounds) - x;
-        if (contains_Range(&run->text, mark.end) || mark.end < run->text.start) {
-            iRangecc mk = !*isInside ? mark
-                              : (iRangecc){ run->text.start, iMax(run->text.start, mark.end) };
-            mk.start    = iMax(mk.start, run->text.start);
-            w           = measureRange_Text(run->font, mk).advance.x;
-            *isInside   = iFalse;
-        }
-        else {
-            *isInside = iTrue; /* at least until the next run */
-        }
-        if (w > width_Rect(run->visBounds) - x) {
-            w = width_Rect(run->visBounds) - x;
-        }
-        if (~run->flags & decoration_GmRunFlag) {
-            const iInt2 visPos =
-                add_I2(run->bounds.pos, addY_I2(d->viewPos, viewPos_DocumentWidget_(d->widget)));
-            const iRect rangeRect = { addX_I2(visPos, x), init_I2(w, height_Rect(run->bounds)) };
-            if (rangeRect.size.x) {
-                fillRect_Paint(&d->paint, rangeRect, color);
-                /* Keep track of the first and last marked rects. */
-                if (d->firstMarkRect.size.x == 0) {
-                    d->firstMarkRect = rangeRect;
-                }
-                d->lastMarkRect = rangeRect;
-            }
-        }
-    }
-    /* Link URLs are not part of the visible document, so they are ignored above. Handle
-       these ranges as a special case. */
-    if (run->linkId && run->flags & decoration_GmRunFlag) {
-        const iRangecc url = linkUrlRange_GmDocument(d->widget->doc, run->linkId);
-        if (contains_Range(&url, mark.start) &&
-            (contains_Range(&url, mark.end) || url.end == mark.end)) {
-            fillRect_Paint(
-                &d->paint,
-                moved_Rect(run->visBounds, addY_I2(d->viewPos, viewPos_DocumentWidget_(d->widget))),
-                color);
-        }
-    }
-}
-
-static void drawMark_DrawContext_(void *context, const iGmRun *run) {
-    iDrawContext *d = context;
-    if (!isMedia_GmRun(run)) {
-        fillRange_DrawContext_(d, run, uiMatching_ColorId, d->widget->foundMark, &d->inFoundMark);
-        fillRange_DrawContext_(d, run, uiMarked_ColorId, d->widget->selectMark, &d->inSelectMark);
-    }
-}
-
-static void drawRun_DrawContext_(void *context, const iGmRun *run) {
-    iDrawContext *d      = context;
-    const iInt2   origin = d->viewPos;
-    /* Keep track of the drawn visible runs. */ {
-        if (!d->runsDrawn.start || run < d->runsDrawn.start) {
-            d->runsDrawn.start = run;
-        }
-        if (!d->runsDrawn.end || run > d->runsDrawn.end) {
-            d->runsDrawn.end = run;
-        }
-    }
-    if (run->mediaType == image_MediaType) {
-        SDL_Texture *tex = imageTexture_Media(media_GmDocument(d->widget->doc), mediaId_GmRun(run));
-        const iRect dst = moved_Rect(run->visBounds, origin);
-        if (tex) {
-            fillRect_Paint(&d->paint, dst, tmBackground_ColorId); /* in case the image has alpha */
-            SDL_RenderCopy(d->paint.dst->render, tex, NULL,
-                           &(SDL_Rect){ dst.pos.x, dst.pos.y, dst.size.x, dst.size.y });
-        }
-        else {
-            drawRect_Paint(&d->paint, dst, tmQuoteIcon_ColorId);
-            drawCentered_Text(uiLabel_FontId,
-                              dst,
-                              iFalse,
-                              tmQuote_ColorId,
-                              explosion_Icon "  Error Loading Image");
-        }
-        return;
-    }
-    else if (isMedia_GmRun(run)) {
-        /* Media UIs are drawn afterwards as a dynamic overlay. */
-        return;
-    }
-    enum iColorId      fg        = run->color;
-    const iGmDocument *doc       = d->widget->doc;
-    const int          linkFlags = linkFlags_GmDocument(doc, run->linkId);
-    /* Hover state of a link. */
-    iBool isHover =
-        (run->linkId && d->widget->hoverLink && run->linkId == d->widget->hoverLink->linkId &&
-         ~run->flags & decoration_GmRunFlag);
-    /* Visible (scrolled) position of the run. */
-    const iInt2 visPos = addX_I2(add_I2(run->visBounds.pos, origin),
-                                 /* Preformatted runs can be scrolled. */
-                                 runOffset_DocumentWidget_(d->widget, run));
-    const iRect visRect = { visPos, run->visBounds.size };
-#if 0
-    if (run->flags & footer_GmRunFlag) {
-        iRect footerBack =
-            (iRect){ visPos, init_I2(width_Rect(d->widgetBounds), run->visBounds.size.y) };
-        footerBack.pos.x = left_Rect(d->widgetBounds);
-        fillRect_Paint(&d->paint, footerBack, tmBackground_ColorId);
-        return;
-    }
-#endif
-    /* Fill the background. */ {
-        if (run->linkId && linkFlags & isOpen_GmLinkFlag && ~linkFlags & content_GmLinkFlag) {
-            /* Open links get a highlighted background. */
-            int       bg       = tmBackgroundOpenLink_ColorId;
-            const int frame    = tmFrameOpenLink_ColorId;
-            iRect     wideRect = { init_I2(left_Rect(d->widgetBounds), visPos.y),
-                                   init_I2(width_Rect(d->widgetBounds) +
-                                           width_Widget(d->widget->scroll),
-                                           height_Rect(run->visBounds)) };
-            /* The first line is composed of two runs that may be drawn in either order, so
-               only draw half of the background. */
-            if (run->flags & decoration_GmRunFlag) {
-                wideRect.size.x = right_Rect(visRect) - left_Rect(wideRect);
-            }
-            else if (run->flags & startOfLine_GmRunFlag) {
-                wideRect.size.x = right_Rect(wideRect) - left_Rect(visRect);
-                wideRect.pos.x  = left_Rect(visRect);
-            }
-            fillRect_Paint(&d->paint, wideRect, bg);
-            if (run->flags & (startOfLine_GmRunFlag | decoration_GmRunFlag)) {
-                drawHLine_Paint(&d->paint, topLeft_Rect(wideRect), width_Rect(wideRect), frame);
-            }
-            /* TODO: The decoration is not marked as endOfLine, so it lacks the bottom line. */
-//            if (run->flags & endOfLine_GmRunFlag) {
-//                drawHLine_Paint(
-//                    &d->paint, addY_I2(bottomLeft_Rect(wideRect), -1), width_Rect(wideRect), frame);
-//            }
-        }
-        else { 
-            /* Normal background for other runs. There are cases when runs get drawn multiple times,
-               e.g., at the buffer boundary, and there are slightly overlapping characters in
-               monospace blocks. Clearing the background here ensures a cleaner visual appearance
-               since only one glyph is visible at any given point. */
-            fillRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmBackground_ColorId);
-        }
-    }
-    if (run->linkId && ~run->flags & decoration_GmRunFlag) {
-        fg = linkColor_GmDocument(doc, run->linkId, isHover ? textHover_GmLinkPart : text_GmLinkPart);
-        if (linkFlags & content_GmLinkFlag) {
-            fg = linkColor_GmDocument(doc, run->linkId, textHover_GmLinkPart); /* link is inactive */
-        }
-    }
-    if (run->flags & altText_GmRunFlag) {
-        const iInt2 margin = preRunMargin_GmDocument(doc, preId_GmRun(run));
-        fillRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmBackgroundAltText_ColorId);
-        drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, tmFrameAltText_ColorId);
-        drawWrapRange_Text(run->font,
-                           add_I2(visPos, margin),
-                           run->visBounds.size.x - 2 * margin.x,
-                           run->color,
-                           run->text);
-    }
-#if 0
-    else if (run->flags & siteBanner_GmRunFlag) {
-        /* Banner background. */
-        iRect bannerBack = initCorners_Rect(topLeft_Rect(d->widgetBounds),
-                                            init_I2(right_Rect(bounds_Widget(constAs_Widget(d->widget))),
-                                                    visPos.y + height_Rect(run->visBounds)));
-        fillRect_Paint(&d->paint, bannerBack, tmBannerBackground_ColorId);
-        drawBannerRun_DrawContext_(d, run, visPos);
-    }
-#endif
-    else {
-        if (d->showLinkNumbers && run->linkId && run->flags & decoration_GmRunFlag) {
-            const size_t ord = visibleLinkOrdinal_DocumentWidget_(d->widget, run->linkId);
-            if (ord >= d->widget->ordinalBase) {
-                const iChar ordChar =
-                    linkOrdinalChar_DocumentWidget_(d->widget, ord - d->widget->ordinalBase);
-                if (ordChar) {
-                    const char *circle = "\u25ef"; /* Large Circle */
-                    const int   circleFont = FONT_ID(default_FontId, regular_FontStyle, contentRegular_FontSize);
-                    iRect nbArea = { init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
-                                     init_I2(3.95f * gap_Text, 1.0f * lineHeight_Text(circleFont)) };
-                    drawRange_Text(
-                        circleFont, topLeft_Rect(nbArea), tmQuote_ColorId, range_CStr(circle));
-                    iRect circleArea = visualBounds_Text(circleFont, range_CStr(circle));
-                    addv_I2(&circleArea.pos, topLeft_Rect(nbArea));
-                    drawCentered_Text(FONT_ID(default_FontId, regular_FontStyle, contentSmall_FontSize),
-                                      circleArea,
-                                      iTrue,
-                                      tmQuote_ColorId,
-                                      "%lc",
-                                      (int) ordChar);
-                    goto runDrawn;
-                }
-            }
-        }
-        if (run->flags & quoteBorder_GmRunFlag) {
-            drawVLine_Paint(&d->paint,
-                            addX_I2(visPos,
-                                    !run->isRTL
-                                        ? -gap_Text * 5 / 2
-                                        : (width_Rect(run->visBounds) + gap_Text * 5 / 2)),
-                            height_Rect(run->visBounds),
-                            tmQuoteIcon_ColorId);
-        }
-        /* Base attributes. */ {
-            int f, c;
-            runBaseAttributes_GmDocument(doc, run, &f, &c);
-            setBaseAttributes_Text(f, c);
-        }
-        drawBoundRange_Text(run->font,
-                            visPos,
-                            (run->isRTL ? -1 : 1) * width_Rect(run->visBounds),
-                            fg,
-                            run->text);
-        setBaseAttributes_Text(-1, -1);
-    runDrawn:;
-    }
-    /* Presentation of links. */
-    if (run->linkId && ~run->flags & decoration_GmRunFlag) {
-        const int metaFont = paragraph_FontId;
-        /* TODO: Show status of an ongoing media request. */
-        const int flags = linkFlags;
-        const iRect linkRect = moved_Rect(run->visBounds, origin);
-        iMediaRequest *mr = NULL;
-        /* Show metadata about inline content. */
-        if (flags & content_GmLinkFlag && run->flags & endOfLine_GmRunFlag) {
-            fg = linkColor_GmDocument(doc, run->linkId, textHover_GmLinkPart);
-            iString text;
-            init_String(&text);
-            const iMediaId linkMedia = findMediaForLink_Media(constMedia_GmDocument(doc),
-                                                              run->linkId, none_MediaType);
-            iAssert(linkMedia.type != none_MediaType);
-            iGmMediaInfo info;
-            info_Media(constMedia_GmDocument(doc), linkMedia, &info);
-            switch (linkMedia.type) {
-                case image_MediaType: {
-                    iAssert(!isEmpty_Rect(run->bounds));
-                    const iInt2 imgSize = imageSize_Media(constMedia_GmDocument(doc), linkMedia);
-                    format_String(&text, "%s \u2014 %d x %d \u2014 %.1f%s",
-                                  info.type, imgSize.x, imgSize.y, info.numBytes / 1.0e6f,
-                                  cstr_Lang("mb"));
-                    break;
-                }
-                case audio_MediaType:
-                    format_String(&text, "%s", info.type);
-                    break;
-                case download_MediaType:
-                    format_String(&text, "%s", info.type);
-                    break;
-                default:
-                    break;
-            }
-            if (linkMedia.type != download_MediaType && /* can't cancel downloads currently */
-                findMediaRequest_DocumentWidget_(d->widget, run->linkId)) {
-                appendFormat_String(
-                    &text, "  %s" close_Icon, isHover ? escape_Color(tmLinkText_ColorId) : "");
-            }
-            const iInt2 size = measureRange_Text(metaFont, range_String(&text)).bounds.size;
-            fillRect_Paint(
-                &d->paint,
-                (iRect){ add_I2(origin, addX_I2(topRight_Rect(run->bounds), -size.x - gap_UI)),
-                         addX_I2(size, 2 * gap_UI) },
-                tmBackground_ColorId);
-            drawAlign_Text(metaFont,
-                           add_I2(topRight_Rect(run->bounds), origin),
-                           fg,
-                           right_Alignment,
-                           "%s", cstr_String(&text));
-            deinit_String(&text);
-        }
-        else if (run->flags & endOfLine_GmRunFlag &&
-                 (mr = findMediaRequest_DocumentWidget_(d->widget, run->linkId)) != NULL) {
-            if (!isFinished_GmRequest(mr->req)) {
-                draw_Text(metaFont,
-                          topRight_Rect(linkRect),
-                          tmInlineContentMetadata_ColorId,
-                          translateCStr_Lang(" \u2014 ${doc.fetching}\u2026 (%.1f ${mb})"),
-                          (float) bodySize_GmRequest(mr->req) / 1.0e6f);
-            }
-        }
-        else if (isHover) {
-            const iGmLinkId linkId = d->widget->hoverLink->linkId;
-            const iString * url    = linkUrl_GmDocument(doc, linkId);
-            const int       flags  = linkFlags;
-            iUrl parts;
-            init_Url(&parts, url);
-            fg                    = linkColor_GmDocument(doc, linkId, textHover_GmLinkPart);
-            const enum iGmLinkScheme scheme = scheme_GmLinkFlag(flags);
-            const iBool showHost  = (flags & humanReadable_GmLinkFlag &&
-                                    (!isEmpty_Range(&parts.host) ||
-                                     scheme == mailto_GmLinkScheme));
-            const iBool showImage = (flags & imageFileExtension_GmLinkFlag) != 0;
-            const iBool showAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
-            iString str;
-            init_String(&str);
-            /* Show scheme and host. */
-            if (run->flags & endOfLine_GmRunFlag &&
-                (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) ||
-                 showHost)) {
-                format_String(
-                    &str,
-                    "%s%s%s%s%s",
-                    showHost ? "" : "",
-                    showHost
-                        ? (scheme == mailto_GmLinkScheme   ? cstr_String(url)
-                           : scheme != gemini_GmLinkScheme ? format_CStr("%s://%s",
-                                                                         cstr_Rangecc(parts.scheme),
-                                                                         cstr_Rangecc(parts.host))
-                                                           : cstr_Rangecc(parts.host))
-                        : "",
-                    showHost && (showImage || showAudio) ? " \u2014" : "",
-                    showImage || showAudio
-                        ? escape_Color(fg)
-                        : escape_Color(linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
-                    showImage || showAudio
-                        ? format_CStr(showImage ? " %s " photo_Icon : " %s \U0001f3b5",
-                                      cstr_Lang(showImage ? "link.hint.image" : "link.hint.audio"))
-                        : "");
-            }
-            if (run->flags & endOfLine_GmRunFlag && flags & visited_GmLinkFlag) {
-                iDate date;
-                init_Date(&date, linkTime_GmDocument(doc, run->linkId));
-                appendCStr_String(&str, " \u2014 ");
-                appendCStr_String(
-                    &str, escape_Color(linkColor_GmDocument(doc, run->linkId, visited_GmLinkPart)));
-                iString *dateStr = format_Date(&date, "%b %d");
-                append_String(&str, dateStr);
-                delete_String(dateStr);
-            }
-            if (!isEmpty_String(&str)) {
-                if (run->isRTL) {
-                    appendCStr_String(&str, " \u2014 ");
-                }
-                else {
-                    prependCStr_String(&str, " \u2014 ");
-                }
-                const iInt2 textSize = measure_Text(metaFont, cstr_String(&str)).bounds.size;
-                int tx = topRight_Rect(linkRect).x;
-                const char *msg = cstr_String(&str);
-                if (run->isRTL) {
-                    tx = topLeft_Rect(linkRect).x - textSize.x;                    
-                }
-                if (tx + textSize.x > right_Rect(d->widgetBounds)) {
-                    tx = right_Rect(d->widgetBounds) - textSize.x;
-                    fillRect_Paint(&d->paint, (iRect){ init_I2(tx, top_Rect(linkRect)), textSize },
-                                   uiBackground_ColorId);
-                    msg += 4; /* skip the space and dash */
-                    tx += measure_Text(metaFont, " \u2014").advance.x / 2;
-                }
-                drawAlign_Text(metaFont,
-                               init_I2(tx, top_Rect(linkRect)),
-                               linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart),
-                               left_Alignment,
-                               "%s",
-                               msg);
-                deinit_String(&str);
-            }
-        }
-    }
-    if (0) {
-        drawRect_Paint(&d->paint, (iRect){ visPos, run->bounds.size }, green_ColorId);
-        drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, red_ColorId);
-    }
-}
-
-static int drawSideRect_(iPaint *p, iRect rect) {
-    int bg = tmBannerBackground_ColorId;
-    int fg = tmBannerIcon_ColorId;
-    if (equal_Color(get_Color(bg), get_Color(tmBackground_ColorId))) {
-        bg = tmBannerIcon_ColorId;
-        fg = tmBannerBackground_ColorId;
-    }
-    fillRect_Paint(p, rect, bg);
-    return fg;
-}
-
-static int sideElementAvailWidth_DocumentWidget_(const iDocumentWidget *d) {
-    return left_Rect(documentBounds_DocumentWidget_(d)) -
-           left_Rect(bounds_Widget(constAs_Widget(d))) - 2 * d->pageMargin * gap_UI;
-}
-
-static iBool isSideHeadingVisible_DocumentWidget_(const iDocumentWidget *d) {
-    return sideElementAvailWidth_DocumentWidget_(d) >= lineHeight_Text(banner_FontId) * 4.5f;
-}
-
-static void updateSideIconBuf_DocumentWidget_(const iDocumentWidget *d) {
-    if (!isExposed_Window(get_Window())) {
-        return;
-    }
-    iDrawBufs *dbuf = d->drawBufs;
-    dbuf->flags &= ~updateSideBuf_DrawBufsFlag;
-    if (dbuf->sideIconBuf) {
-        SDL_DestroyTexture(dbuf->sideIconBuf);
-        dbuf->sideIconBuf = NULL;
-    }
-//    const iGmRun *banner = siteBanner_GmDocument(d->doc);
-    if (isEmpty_Banner(d->banner)) {
-        return;
-    }
-    const int   margin           = gap_UI * d->pageMargin;
-    const int   minBannerSize    = lineHeight_Text(banner_FontId) * 2;
-    const iChar icon             = siteIcon_GmDocument(d->doc);
-    const int   avail            = sideElementAvailWidth_DocumentWidget_(d) - margin;
-    iBool       isHeadingVisible = isSideHeadingVisible_DocumentWidget_(d);
-    /* Determine the required size. */
-    iInt2 bufSize = init1_I2(minBannerSize);
-    const int sideHeadingFont = FONT_ID(documentHeading_FontId, regular_FontStyle, contentBig_FontSize);
-    if (isHeadingVisible) {
-        const iInt2 headingSize = measureWrapRange_Text(sideHeadingFont, avail,
-                                                        currentHeading_DocumentWidget_(d)).bounds.size;
-        if (headingSize.x > 0) {
-            bufSize.y += gap_Text + headingSize.y;
-            bufSize.x = iMax(bufSize.x, headingSize.x);
-        }
-        else {
-            isHeadingVisible = iFalse;
-        }
-    }
-    SDL_Renderer *render = renderer_Window(get_Window());
-    dbuf->sideIconBuf = SDL_CreateTexture(render,
-                                          SDL_PIXELFORMAT_RGBA4444,
-                                          SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
-                                          bufSize.x, bufSize.y);
-    iPaint p;
-    init_Paint(&p);
-    beginTarget_Paint(&p, dbuf->sideIconBuf);
-    const iColor back = get_Color(tmBannerSideTitle_ColorId);
-    SDL_SetRenderDrawColor(render, back.r, back.g, back.b, 0); /* better blending of the edge */
-    SDL_RenderClear(render);
-    const iRect iconRect = { zero_I2(), init1_I2(minBannerSize) };
-    int fg = drawSideRect_(&p, iconRect);
-    iString str;
-    initUnicodeN_String(&str, &icon, 1);
-    drawCentered_Text(banner_FontId, iconRect, iTrue, fg, "%s", cstr_String(&str));
-    deinit_String(&str);
-    if (isHeadingVisible) {
-        iRangecc    text = currentHeading_DocumentWidget_(d);
-        iInt2       pos  = addY_I2(bottomLeft_Rect(iconRect), gap_Text);
-        const int   font = sideHeadingFont;
-        drawWrapRange_Text(font, pos, avail, tmBannerSideTitle_ColorId, text);
-    }
-    endTarget_Paint(&p);
-    SDL_SetTextureBlendMode(dbuf->sideIconBuf, SDL_BLENDMODE_BLEND);
-}
-
-static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
-    const iWidget *w         = constAs_Widget(d);
-    const iRect    bounds    = bounds_Widget(w);
-    const iRect    docBounds = documentBounds_DocumentWidget_(d);
-    const int      margin    = gap_UI * d->pageMargin;
-    float          opacity   = value_Anim(&d->sideOpacity);
-    const int      avail     = left_Rect(docBounds) - left_Rect(bounds) - 2 * margin;
-    iDrawBufs *    dbuf      = d->drawBufs;
-    iPaint         p;
-    init_Paint(&p);
-    setClip_Paint(&p, boundsWithoutVisualOffset_Widget(w));
-    /* Side icon and current heading. */
-    if (prefs_App()->sideIcon && opacity > 0 && dbuf->sideIconBuf) {
-        const iInt2 texSize = size_SDLTexture(dbuf->sideIconBuf);
-        if (avail > texSize.x) {
-            const int minBannerSize = lineHeight_Text(banner_FontId) * 2;
-            iInt2 pos = addY_I2(add_I2(topLeft_Rect(bounds), init_I2(margin, 0)),
-                                height_Rect(bounds) / 2 - minBannerSize / 2 -
-                                    (texSize.y > minBannerSize
-                                         ? (gap_Text + lineHeight_Text(heading3_FontId)) / 2
-                                         : 0));
-            SDL_SetTextureAlphaMod(dbuf->sideIconBuf, 255 * opacity);
-            SDL_RenderCopy(renderer_Window(get_Window()),
-                           dbuf->sideIconBuf, NULL,
-                           &(SDL_Rect){ pos.x, pos.y, texSize.x, texSize.y });
-        }
-    }
-    /* Reception timestamp. */
-    if (dbuf->timestampBuf && dbuf->timestampBuf->size.x <= avail) {
-        draw_TextBuf(
-            dbuf->timestampBuf,
-            add_I2(
-                bottomLeft_Rect(bounds),
-                init_I2(margin,
-                        -margin + -dbuf->timestampBuf->size.y +
-                            iMax(0, d->scrollY.max - pos_SmoothScroll(&d->scrollY)))),
-            tmQuoteIcon_ColorId);
-    }
-    unsetClip_Paint(&p);
-}
-
-static void drawMedia_DocumentWidget_(const iDocumentWidget *d, iPaint *p) {
-    iConstForEach(PtrArray, i, &d->visibleMedia) {
-        const iGmRun * run = i.ptr;
-        if (run->mediaType == audio_MediaType) {
-            iPlayerUI ui;
-            init_PlayerUI(&ui,
-                          audioPlayer_Media(media_GmDocument(d->doc), mediaId_GmRun(run)),
-                          runRect_DocumentWidget_(d, run));
-            draw_PlayerUI(&ui, p);
-        }
-        else if (run->mediaType == download_MediaType) {
-            iDownloadUI ui;
-            init_DownloadUI(&ui, constMedia_GmDocument(d->doc), run->mediaId,
-                            runRect_DocumentWidget_(d, run));
-            draw_DownloadUI(&ui, p);
-        }
-    }
-}
-
-static void extend_GmRunRange_(iGmRunRange *runs) {
-    if (runs->start) {
-        runs->start--;
-        runs->end++;
+static void checkPendingInvalidation_DocumentWidget_(const iDocumentWidget *d) {
+    if (d->flags & invalidationPending_DocumentWidgetFlag &&
+        !isAffectedByVisualOffset_Widget(constAs_Widget(d))) {
+        //        printf("%p visoff: %d\n", d, left_Rect(bounds_Widget(w)) - left_Rect(boundsWithoutVisualOffset_Widget(w)));
+        iDocumentWidget *m = (iDocumentWidget *) d; /* Hrrm, not const... */
+        m->flags &= ~invalidationPending_DocumentWidgetFlag;
+        invalidate_DocumentWidget_(m);
     }
 }
 
-static iBool render_DocumentWidget_(const iDocumentWidget *d, iDrawContext *ctx, iBool prerenderExtra) {
-    iBool didDraw = iFalse;
-    const iRect bounds = bounds_Widget(constAs_Widget(d));
-    const iRect ctxWidgetBounds = init_Rect(
-        0, 0, width_Rect(bounds) - constAs_Widget(d->scroll)->rect.size.x, height_Rect(bounds));
-    const iRangei full = { 0, size_GmDocument(d->doc).y };
-    const iRangei vis = ctx->vis;
-    iVisBuf *visBuf = d->visBuf; /* will be updated now */
-    d->drawBufs->lastRenderTime = SDL_GetTicks();
-    /* Swap buffers around to have room available both before and after the visible region. */
-    allocVisBuffer_DocumentWidget_(d);
-    reposition_VisBuf(visBuf, vis);
-    /* Redraw the invalid ranges. */
-    if (~flags_Widget(constAs_Widget(d)) & destroyPending_WidgetFlag) {
-        iPaint *p = &ctx->paint;
-        init_Paint(p);
-        iForIndices(i, visBuf->buffers) {
-            iVisBufTexture *buf         = &visBuf->buffers[i];
-            iVisBufMeta    *meta        = buf->user;
-            const iRangei   bufRange    = intersect_Rangei(bufferRange_VisBuf(visBuf, i), full);
-            const iRangei   bufVisRange = intersect_Rangei(bufRange, vis);
-            ctx->widgetBounds = moved_Rect(ctxWidgetBounds, init_I2(0, -buf->origin));
-            ctx->viewPos      = init_I2(left_Rect(ctx->docBounds) - left_Rect(bounds), -buf->origin);
-//            printf("  buffer %zu: buf vis range %d...%d\n", i, bufVisRange.start, bufVisRange.end);
-            if (!prerenderExtra && !isEmpty_Range(&bufVisRange)) {
-                didDraw = iTrue;
-                if (isEmpty_Rangei(buf->validRange)) {
-                    /* Fill the required currently visible range (vis). */
-                    const iRangei bufVisRange = intersect_Rangei(bufRange, vis);
-                    if (!isEmpty_Range(&bufVisRange)) {
-                        beginTarget_Paint(p, buf->texture);
-                        fillRect_Paint(p, (iRect){ zero_I2(), visBuf->texSize }, tmBackground_ColorId);
-                        iZap(ctx->runsDrawn);
-                        render_GmDocument(d->doc, bufVisRange, drawRun_DrawContext_, ctx);
-                        meta->runsDrawn = ctx->runsDrawn;
-                        extend_GmRunRange_(&meta->runsDrawn);
-                        buf->validRange = bufVisRange;
-    //                printf("  buffer %zu valid %d...%d\n", i, bufRange.start, bufRange.end);
-                    }
-                }
-                else {
-                    /* Progressively fill the required runs. */
-                    if (meta->runsDrawn.start) {
-                        beginTarget_Paint(p, buf->texture);
-                        meta->runsDrawn.start = renderProgressive_GmDocument(d->doc, meta->runsDrawn.start,
-                                                                             -1, iInvalidSize,
-                                                                             bufVisRange,
-                                                                             drawRun_DrawContext_,
-                                                                             ctx);
-                        buf->validRange.start = bufVisRange.start;
-                    }
-                    if (meta->runsDrawn.end) {
-                        beginTarget_Paint(p, buf->texture);
-                        meta->runsDrawn.end = renderProgressive_GmDocument(d->doc, meta->runsDrawn.end,
-                                                                           +1, iInvalidSize,
-                                                                           bufVisRange,
-                                                                           drawRun_DrawContext_,
-                                                                           ctx);
-                        buf->validRange.end = bufVisRange.end;
-                    }
-                }
-            }
-            /* Progressively draw the rest of the buffer if it isn't fully valid. */
-            if (prerenderExtra && !equal_Rangei(bufRange, buf->validRange)) {
-                const iGmRun *next;
-//                printf("%zu: prerenderExtra (start:%p end:%p)\n", i, meta->runsDrawn.start, meta->runsDrawn.end);
-                if (meta->runsDrawn.start == NULL) {
-                    /* Haven't drawn anything yet in this buffer, so let's try seeding it. */
-                    const int rh = lineHeight_Text(paragraph_FontId);
-                    const int y = i >= iElemCount(visBuf->buffers) / 2 ? bufRange.start : (bufRange.end - rh);
-                    beginTarget_Paint(p, buf->texture);
-                    fillRect_Paint(p, (iRect){ zero_I2(), visBuf->texSize }, tmBackground_ColorId);
-                    buf->validRange = (iRangei){ y, y + rh };
-                    iZap(ctx->runsDrawn);
-                    render_GmDocument(d->doc, buf->validRange, drawRun_DrawContext_, ctx);
-                    meta->runsDrawn = ctx->runsDrawn;
-                    extend_GmRunRange_(&meta->runsDrawn);
-//                    printf("%zu: seeded, next %p:%p\n", i, meta->runsDrawn.start, meta->runsDrawn.end);
-                    didDraw = iTrue;
-                }
-                else {
-                    if (meta->runsDrawn.start) {
-                        const iRangei upper = intersect_Rangei(bufRange, (iRangei){ full.start, buf->validRange.start });
-                        if (upper.end > upper.start) {
-                            beginTarget_Paint(p, buf->texture);
-                            next = renderProgressive_GmDocument(d->doc, meta->runsDrawn.start,
-                                                                -1, 1, upper,
-                                                                drawRun_DrawContext_,
-                                                                ctx);
-                            if (next && meta->runsDrawn.start != next) {
-                                meta->runsDrawn.start = next;
-                                buf->validRange.start = bottom_Rect(next->visBounds);
-                                didDraw = iTrue;
-                            }
-                            else {
-                                buf->validRange.start = bufRange.start;
-                            }
-                        }
-                    }
-                    if (!didDraw && meta->runsDrawn.end) {
-                        const iRangei lower = intersect_Rangei(bufRange, (iRangei){ buf->validRange.end, full.end });
-                        if (lower.end > lower.start) {
-                            beginTarget_Paint(p, buf->texture);
-                            next = renderProgressive_GmDocument(d->doc, meta->runsDrawn.end,
-                                                                +1, 1, lower,
-                                                                drawRun_DrawContext_,
-                                                                ctx);
-                            if (next && meta->runsDrawn.end != next) {
-                                meta->runsDrawn.end = next;
-                                buf->validRange.end = top_Rect(next->visBounds);
-                                didDraw = iTrue;
-                            }
-                            else {
-                                buf->validRange.end = bufRange.end;
-                            }
-                        }
-                    }
-                }
-            }
-            /* Draw any invalidated runs that fall within this buffer. */
-            if (!prerenderExtra) {
-                const iRangei bufRange = { buf->origin, buf->origin + visBuf->texSize.y };
-                /* Clear full-width backgrounds first in case there are any dynamic elements. */ {
-                    iConstForEach(PtrSet, r, d->invalidRuns) {
-                        const iGmRun *run = *r.value;
-                        if (isOverlapping_Rangei(bufRange, ySpan_Rect(run->visBounds))) {
-                            beginTarget_Paint(p, buf->texture);
-                            fillRect_Paint(p,
-                                           init_Rect(0,
-                                                     run->visBounds.pos.y - buf->origin,
-                                                     visBuf->texSize.x,
-                                                     run->visBounds.size.y),
-                                           tmBackground_ColorId);
-                        }
-                    }
-                }
-                setAnsiFlags_Text(ansiEscapes_GmDocument(d->doc));
-                iConstForEach(PtrSet, r, d->invalidRuns) {
-                    const iGmRun *run = *r.value;
-                    if (isOverlapping_Rangei(bufRange, ySpan_Rect(run->visBounds))) {
-                        beginTarget_Paint(p, buf->texture);
-                        drawRun_DrawContext_(ctx, run);
-                    }
-                }
-                setAnsiFlags_Text(allowAll_AnsiFlag);
-            }
-            endTarget_Paint(p);
-            if (prerenderExtra && didDraw) {
-                /* Just a run at a time. */
-                break;
-            }
-        }
-        if (!prerenderExtra) {
-            clear_PtrSet(d->invalidRuns);
-        }
-    }
-    return didDraw;
-}
-
 static void prerender_DocumentWidget_(iAny *context) {
+    iAssert(isInstance_Object(context, &Class_DocumentWidget));
     if (current_Root() == NULL) {
         /* The widget has probably been removed from the widget tree, pending destruction.
            Tickers are not cancelled until the widget is actually destroyed. */
@@ -4998,15 +5474,16 @@ static void prerender_DocumentWidget_(iAny *context) {
     }
     const iDocumentWidget *d = context;
     iDrawContext ctx = {
-        .widget          = d,
-        .docBounds       = documentBounds_DocumentWidget_(d),
-        .vis             = visibleRange_DocumentWidget_(d),
-        .showLinkNumbers = (d->flags & showLinkNumbers_DocumentWidgetFlag) != 0
+                  .view          = &d->view,
+                  .docBounds       = documentBounds_DocumentView_(&d->view),
+                  .vis             = visibleRange_DocumentView_(&d->view),
+                  .showLinkNumbers = (d->flags & showLinkNumbers_DocumentWidgetFlag) != 0
     };
-//    printf("%u prerendering\n", SDL_GetTicks());
-    if (d->visBuf->buffers[0].texture) {
-        if (render_DocumentWidget_(d, &ctx, iTrue /* just fill up progressively */)) {
-            /* Something was drawn, should check if there is still more to do. */
+    //    printf("%u prerendering\n", SDL_GetTicks());
+    if (d->view.visBuf->buffers[0].texture) {
+        makePaletteGlobal_GmDocument(d->view.doc);
+        if (render_DocumentView_(&d->view, &ctx, iTrue /* just fill up progressively */)) {
+            /* Something was drawn, should check later if there is still more to do. */
             addTicker_App(prerender_DocumentWidget_, context);
         }
     }
@@ -5020,108 +5497,54 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     if (width_Rect(bounds) <= 0) {
         return;
     }
-    /* TODO: Come up with a better palette caching system.
-       It should be able to recompute cached colors in `History` when the theme has changed.
-       Cache the theme seed in `GmDocument`? */
-//    makePaletteGlobal_GmDocument(d->doc);
-    if (d->drawBufs->flags & updateTimestampBuf_DrawBufsFlag) {
-        updateTimestampBuf_DocumentWidget_(d);
-    }
-    if (d->drawBufs->flags & updateSideBuf_DrawBufsFlag) {
-        updateSideIconBuf_DocumentWidget_(d);
-    }
-    const iRect   docBounds = documentBounds_DocumentWidget_(d);
-    const iRangei vis       = visibleRange_DocumentWidget_(d);
-    iDrawContext  ctx = {
-        .widget          = d,
-        .docBounds       = docBounds,
-        .vis             = vis,
-        .showLinkNumbers = (d->flags & showLinkNumbers_DocumentWidgetFlag) != 0,
-    };
-    init_Paint(&ctx.paint);
-    render_DocumentWidget_(d, &ctx, iFalse /* just the mandatory parts */);
-    int         yTop             = docBounds.pos.y + viewPos_DocumentWidget_(d);
-    const iBool isDocEmpty       = size_GmDocument(d->doc).y == 0;
-    const iBool isTouchSelecting = (flags_Widget(w) & touchDrag_WidgetFlag) != 0;
-    if (!isDocEmpty || !isEmpty_Banner(d->banner)) {
-        const int docBgColor = isDocEmpty ? tmBannerBackground_ColorId : tmBackground_ColorId;
-        setClip_Paint(&ctx.paint, clipBounds);
-        if (!isDocEmpty) {
-            draw_VisBuf(d->visBuf, init_I2(bounds.pos.x, yTop), ySpan_Rect(bounds));
-        }
-        /* Text markers. */
-        if (!isEmpty_Range(&d->foundMark) || !isEmpty_Range(&d->selectMark)) {
-            SDL_Renderer *render = renderer_Window(get_Window());
-            ctx.firstMarkRect = zero_Rect();
-            ctx.lastMarkRect = zero_Rect();
-            SDL_SetRenderDrawBlendMode(render,
-                                       isDark_ColorTheme(colorTheme_App()) ? SDL_BLENDMODE_ADD
-                                                                           : SDL_BLENDMODE_BLEND);
-            ctx.viewPos = topLeft_Rect(docBounds);
-            /* Marker starting outside the visible range? */
-            if (d->visibleRuns.start) {
-                if (!isEmpty_Range(&d->selectMark) &&
-                    d->selectMark.start < d->visibleRuns.start->text.start &&
-                    d->selectMark.end > d->visibleRuns.start->text.start) {
-                    ctx.inSelectMark = iTrue;
-                }
-                if (isEmpty_Range(&d->foundMark) &&
-                    d->foundMark.start < d->visibleRuns.start->text.start &&
-                    d->foundMark.end > d->visibleRuns.start->text.start) {
-                    ctx.inFoundMark = iTrue;
-                }
-            }
-            render_GmDocument(d->doc, vis, drawMark_DrawContext_, &ctx);
-            SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_NONE);
-            /* Selection range pins. */
-            if (isTouchSelecting) {
-                drawPin_Paint(&ctx.paint, ctx.firstMarkRect, 0, tmQuote_ColorId);
-                drawPin_Paint(&ctx.paint, ctx.lastMarkRect,  1, tmQuote_ColorId);
-            }
-        }
-        drawMedia_DocumentWidget_(d, &ctx.paint);
-        /* Fill the top and bottom, in case the document is short. */
-        if (yTop > top_Rect(bounds)) {
-            fillRect_Paint(&ctx.paint,
-                           (iRect){ bounds.pos, init_I2(bounds.size.x, yTop - top_Rect(bounds)) },
-                           !isEmpty_Banner(d->banner) ? tmBannerBackground_ColorId
-                                                      : docBgColor);
-        }
-        /* Banner. */
-        if (!isDocEmpty || numItems_Banner(d->banner) > 0) {
-            /* Fill the part between the banner and the top of the document. */
-            fillRect_Paint(&ctx.paint,
-                           (iRect){ init_I2(left_Rect(bounds),
-                                            top_Rect(docBounds) + viewPos_DocumentWidget_(d) -
-                                                documentTopPad_DocumentWidget_(d)),
-                                    init_I2(bounds.size.x, documentTopPad_DocumentWidget_(d)) },
-                           docBgColor);
-            setPos_Banner(d->banner, addY_I2(topLeft_Rect(docBounds),
-                                             -pos_SmoothScroll(&d->scrollY)));
-            draw_Banner(d->banner);
-        }
-        const int yBottom = yTop + size_GmDocument(d->doc).y;
-        if (yBottom < bottom_Rect(bounds)) {
-            fillRect_Paint(&ctx.paint,
-                           init_Rect(bounds.pos.x, yBottom, bounds.size.x, bottom_Rect(bounds) - yBottom),
-                           !isDocEmpty ? docBgColor : tmBannerBackground_ColorId);
-        }
-        unsetClip_Paint(&ctx.paint);
-        drawSideElements_DocumentWidget_(d);
-        if (prefs_App()->hoverLink && d->hoverLink) {
-            const int      font     = uiLabel_FontId;
-            const iRangecc linkUrl  = range_String(linkUrl_GmDocument(d->doc, d->hoverLink->linkId));
-            const iInt2    size     = measureRange_Text(font, linkUrl).bounds.size;
-            const iRect    linkRect = { addY_I2(bottomLeft_Rect(bounds), -size.y),
-                                        addX_I2(size, 2 * gap_UI) };
-            fillRect_Paint(&ctx.paint, linkRect, tmBackground_ColorId);
-            drawRange_Text(font, addX_I2(topLeft_Rect(linkRect), gap_UI), tmParagraph_ColorId, linkUrl);
-        }
-    }
+    checkPendingInvalidation_DocumentWidget_(d);
+    draw_DocumentView_(&d->view);
+    iPaint p;
+    init_Paint(&p);
     if (colorTheme_App() == pureWhite_ColorTheme) {
-        drawHLine_Paint(&ctx.paint, topLeft_Rect(bounds), width_Rect(bounds), uiSeparator_ColorId);
+        drawHLine_Paint(&p, topLeft_Rect(bounds), width_Rect(bounds), uiSeparator_ColorId);
     }
+    /* Pull action indicator. */
+    if (deviceType_App() != desktop_AppDeviceType) {
+        float pullPos = pullActionPos_SmoothScroll(&d->view.scrollY);
+        /* Account for the part where the indicator isn't yet visible. */
+        pullPos = (pullPos - 0.2f) / 0.8f;
+        iRect indRect = initCentered_Rect(init_I2(mid_Rect(bounds).x,
+                                                  top_Rect(bounds) - 5 * gap_UI -
+                                                  pos_SmoothScroll(&d->view.scrollY)),
+                                          init_I2(20 * gap_UI, 2 * gap_UI));
+        setClip_Paint(&p, clipBounds);
+        int color = pullPos < 1.0f ? tmBannerItemFrame_ColorId : tmBannerItemText_ColorId;
+        drawRect_Paint(&p, indRect, color);
+        if (pullPos > 0) {
+            shrink_Rect(&indRect, divi_I2(gap2_UI, 2));
+            indRect.size.x *= pullPos;
+            fillRect_Paint(&p, indRect, color);
+        }
+        unsetClip_Paint(&p);
+    }
+    /* Scroll bar. */
     drawChildren_Widget(w);
+    /* Information about the hovered link. */
+    if (deviceType_App() == desktop_AppDeviceType && prefs_App()->hoverLink && d->linkInfo) {
+        const int pad = 0; /*gap_UI;*/
+        update_LinkInfo(d->linkInfo,
+                        d->view.doc,
+                        d->view.hoverLink ? d->view.hoverLink->linkId : 0,
+                        width_Rect(bounds) - 2 * pad);
+        const iInt2 infoSize = size_LinkInfo(d->linkInfo);
+        iInt2 infoPos = add_I2(bottomLeft_Rect(bounds), init_I2(pad, -infoSize.y - pad));
+        if (d->view.hoverLink) {
+            const iRect runRect = runRect_DocumentView_(&d->view, d->view.hoverLink);
+            d->linkInfo->isAltPos =
+                (bottom_Rect(runRect) >= infoPos.y - lineHeight_Text(paragraph_FontId));
+        }
+        if (d->linkInfo->isAltPos) {
+            infoPos.y = top_Rect(bounds) + pad;
+        }
+        draw_LinkInfo(d->linkInfo, infoPos);
+    }
+    /* Full-sized download indicator. */
     if (d->flags & drawDownloadCounter_DocumentWidgetFlag && isRequestOngoing_DocumentWidget(d)) {
         const int font = uiLabelLarge_FontId;
         const iInt2 sevenSegWidth = measureRange_Text(font, range_CStr("\U0001fbf0")).bounds.size;
@@ -5131,62 +5554,26 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
                                       tmQuote_ColorId, tmQuoteIcon_ColorId,
                                       bodySize_GmRequest(d->request));
     }
-    /* Alt text. */
-    const float altTextOpacity = value_Anim(&d->altTextOpacity) * 6 - 5;
-    if (d->hoverAltPre && altTextOpacity > 0) {
-        const iGmPreMeta *meta = preMeta_GmDocument(d->doc, preId_GmRun(d->hoverAltPre));
-        if (meta->flags & topLeft_GmPreMetaFlag && ~meta->flags & decoration_GmRunFlag &&
-            !isEmpty_Range(&meta->altText)) {
-            const int   margin   = 3 * gap_UI / 2;
-            const int   altFont  = uiLabel_FontId;
-            const int   wrap     = docBounds.size.x - 2 * margin;
-            iInt2 pos            = addY_I2(add_I2(docBounds.pos, meta->pixelRect.pos),
-                                           viewPos_DocumentWidget_(d));
-            const iInt2 textSize = measureWrapRange_Text(altFont, wrap, meta->altText).bounds.size;
-            pos.y -= textSize.y + gap_UI;
-            pos.y               = iMax(pos.y, top_Rect(bounds));
-            const iRect altRect = { pos, init_I2(docBounds.size.x, textSize.y) };
-            ctx.paint.alpha     = altTextOpacity * 255;
-            if (altTextOpacity < 1) {
-                SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
-            }
-            fillRect_Paint(&ctx.paint, altRect, tmBackgroundAltText_ColorId);
-            drawRect_Paint(&ctx.paint, altRect, tmFrameAltText_ColorId);
-            setOpacity_Text(altTextOpacity);
-            drawWrapRange_Text(altFont, addX_I2(pos, margin), wrap,
-                               tmQuote_ColorId, meta->altText);
-            SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
-            setOpacity_Text(1.0f);
-        }
-    }
     /* Pinch zoom indicator. */
     if (d->flags & pinchZoom_DocumentWidgetFlag) {
         const int   font   = uiLabelLargeBold_FontId;
         const int   height = lineHeight_Text(font) * 2;
         const iInt2 size   = init_I2(height * 2, height);
         const iRect rect   = { sub_I2(mid_Rect(bounds), divi_I2(size, 2)), size };
-        fillRect_Paint(&ctx.paint, rect, d->pinchZoomPosted == 100 ? uiTextCaution_ColorId : uiTextAction_ColorId);
+        fillRect_Paint(&p, rect, d->pinchZoomPosted == 100 ? uiTextCaution_ColorId : uiTextAction_ColorId);
         drawCentered_Text(font, bounds, iFalse, uiBackground_ColorId, "%d %%",
                           d->pinchZoomPosted);
     }
-    /* Touch selection indicator. */
-    if (isTouchSelecting) {
-        iRect rect = { topLeft_Rect(bounds),
-                       init_I2(width_Rect(bounds), lineHeight_Text(uiLabelBold_FontId)) };
-        fillRect_Paint(&ctx.paint, rect, uiTextAction_ColorId);
-        const iRangecc mark = selectMark_DocumentWidget_(d);
-        drawCentered_Text(uiLabelBold_FontId, rect, iFalse, uiBackground_ColorId, "%zu bytes selected",
-                          size_Range(&mark));
-    }
+    /* Dimming during swipe animation. */
     if (w->offsetRef) {
         const int offX = visualOffsetByReference_Widget(w);
         if (offX) {
-            setClip_Paint(&ctx.paint, clipBounds);
+            setClip_Paint(&p, clipBounds);
             SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
-            ctx.paint.alpha = iAbs(offX) / (float) get_Window()->size.x * 300;
-            fillRect_Paint(&ctx.paint, bounds, backgroundFadeColor_Widget());
+            p.alpha = iAbs(offX) / (float) get_Window()->size.x * 300;
+            fillRect_Paint(&p, bounds, backgroundFadeColor_Widget());
             SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
-            unsetClip_Paint(&ctx.paint);
+            unsetClip_Paint(&p);
         }
         else {
             /* TODO: Should have a better place to do this; drawing is supposed to be immutable. */
@@ -5195,11 +5582,139 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
             mut->flags &= ~refChildrenOffset_WidgetFlag;
         }
     }
-//    drawRect_Paint(&ctx.paint, docBounds, red_ColorId);
+//    drawRect_Paint(&p, docBounds, red_ColorId);
+    if (deviceType_App() == phone_AppDeviceType) {
+        /* The phone toolbar uses the palette of the active tab, but there may be other
+           documents drawn before the toolbar, causing the colors to be incorrect. */
+        makePaletteGlobal_GmDocument(document_App()->view.doc);
+    }
 }
 
 /*----------------------------------------------------------------------------------------------*/
 
+void init_DocumentWidget(iDocumentWidget *d) {
+    iWidget *w = as_Widget(d);
+    init_Widget(w);
+    setId_Widget(w, format_CStr("document%03d", ++docEnum_));
+    setFlags_Widget(w, hover_WidgetFlag | noBackground_WidgetFlag, iTrue);
+#if defined (iPlatformAppleDesktop)
+    iBool enableSwipeNavigation = iTrue; /* swipes on the trackpad */
+#else
+    iBool enableSwipeNavigation = (deviceType_App() != desktop_AppDeviceType);
+#endif
+    if (enableSwipeNavigation) {
+        setFlags_Widget(w, leftEdgeDraggable_WidgetFlag | rightEdgeDraggable_WidgetFlag |
+                               horizontalOffset_WidgetFlag, iTrue);
+    }
+    init_PersistentDocumentState(&d->mod);
+    d->flags           = 0;
+    d->phoneToolbar    = findWidget_App("toolbar");
+    d->footerButtons   = NULL;
+    iZap(d->certExpiry);
+    d->certFingerprint  = new_Block(0);
+    d->certFlags        = 0;
+    d->certSubject      = new_String();
+    d->state            = blank_RequestState;
+    d->titleUser        = new_String();
+    d->request          = NULL;
+    d->requestLinkId    = 0;
+    d->isRequestUpdated = iFalse;
+    d->media            = new_ObjectList();
+    d->banner           = new_Banner();
+    setOwner_Banner(d->banner, d);
+    d->redirectCount    = 0;
+    d->ordinalBase      = 0;
+    d->wheelSwipeState  = none_WheelSwipeState;
+    d->selectMark       = iNullRange;
+    d->foundMark        = iNullRange;
+    d->contextLink      = NULL;
+    d->sourceStatus = none_GmStatusCode;
+    init_String(&d->sourceHeader);
+    init_String(&d->sourceMime);
+    init_Block(&d->sourceContent, 0);
+    iZap(d->sourceTime);
+    d->sourceGempub    = NULL;
+    d->initNormScrollY = 0;
+    d->grabbedPlayer   = NULL;
+    d->mediaTimer      = 0;
+    init_String(&d->pendingGotoHeading);
+    init_String(&d->linePrecedingLink);
+    init_Click(&d->click, d, SDL_BUTTON_LEFT);
+    d->linkInfo = (deviceType_App() == desktop_AppDeviceType ? new_LinkInfo() : NULL);
+    init_DocumentView(&d->view);
+    setOwner_DocumentView_(&d->view, d);
+    addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
+    d->menu         = NULL; /* created when clicking */
+    d->playerMenu   = NULL;
+    d->copyMenu     = NULL;
+    d->translation  = NULL;
+    addChildFlags_Widget(w,
+                         iClob(new_IndicatorWidget()),
+                         resizeToParentWidth_WidgetFlag | resizeToParentHeight_WidgetFlag);
+#if !defined (iPlatformAppleDesktop) /* in system menu */
+    addAction_Widget(w, reload_KeyShortcut, "navigate.reload");
+    addAction_Widget(w, closeTab_KeyShortcut, "tabs.close");
+    addAction_Widget(w, SDLK_d, KMOD_PRIMARY, "bookmark.add");
+    addAction_Widget(w, subscribeToPage_KeyModifier, "feeds.subscribe");
+#endif
+    addAction_Widget(w, navigateBack_KeyShortcut, "navigate.back");
+    addAction_Widget(w, navigateForward_KeyShortcut, "navigate.forward");
+    addAction_Widget(w, navigateParent_KeyShortcut, "navigate.parent");
+    addAction_Widget(w, navigateRoot_KeyShortcut, "navigate.root");
+}
+
+void cancelAllRequests_DocumentWidget(iDocumentWidget *d) {
+    iForEach(ObjectList, i, d->media) {
+        iMediaRequest *mr = i.object;
+        cancel_GmRequest(mr->req);
+    }
+    if (d->request) {
+        cancel_GmRequest(d->request);
+    }
+}
+
+void deinit_DocumentWidget(iDocumentWidget *d) {
+    //    printf("\n* * * * * * * *\nDEINIT DOCUMENT: %s\n* * * * * * * *\n\n",
+    //           cstr_String(&d->widget.id)); fflush(stdout);
+    cancelAllRequests_DocumentWidget(d);
+    pauseAllPlayers_Media(media_GmDocument(d->view.doc), iTrue);
+    removeTicker_App(animate_DocumentWidget_, d);
+    removeTicker_App(prerender_DocumentWidget_, d);
+    remove_Periodic(periodic_App(), d);
+    delete_Translation(d->translation);
+    deinit_DocumentView(&d->view);
+    delete_LinkInfo(d->linkInfo);
+    iRelease(d->media);
+    iRelease(d->request);
+    delete_Gempub(d->sourceGempub);
+    deinit_String(&d->linePrecedingLink);
+    deinit_String(&d->pendingGotoHeading);
+    deinit_Block(&d->sourceContent);
+    deinit_String(&d->sourceMime);
+    deinit_String(&d->sourceHeader);
+    delete_Banner(d->banner);
+    if (d->mediaTimer) {
+        SDL_RemoveTimer(d->mediaTimer);
+    }
+    delete_Block(d->certFingerprint);
+    delete_String(d->certSubject);
+    delete_String(d->titleUser);
+    deinit_PersistentDocumentState(&d->mod);
+}
+
+void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
+    setUrl_GmDocument(d->view.doc, d->mod.url);
+    const int docWidth = documentWidth_DocumentView_(&d->view);
+    setSource_GmDocument(d->view.doc,
+                         source,
+                         docWidth,
+                         width_Widget(d),
+                         isFinished_GmRequest(d->request) ? final_GmDocumentUpdate
+                                                          : partial_GmDocumentUpdate);
+    setWidth_Banner(d->banner, docWidth);
+    documentWasChanged_DocumentWidget_(d);
+}
+
 iHistory *history_DocumentWidget(iDocumentWidget *d) {
     return d->mod.history;
 }
@@ -5209,7 +5724,7 @@ const iString *url_DocumentWidget(const iDocumentWidget *d) {
 }
 
 const iGmDocument *document_DocumentWidget(const iDocumentWidget *d) {
-    return d->doc;
+    return d->view.doc;
 }
 
 const iBlock *sourceContent_DocumentWidget(const iDocumentWidget *d) {
@@ -5217,20 +5732,20 @@ const iBlock *sourceContent_DocumentWidget(const iDocumentWidget *d) {
 }
 
 int documentWidth_DocumentWidget(const iDocumentWidget *d) {
-    return documentWidth_DocumentWidget_(d);
+    return documentWidth_DocumentView_(&d->view);
 }
 
 const iString *feedTitle_DocumentWidget(const iDocumentWidget *d) {
-    if (!isEmpty_String(title_GmDocument(d->doc))) {
-        return title_GmDocument(d->doc);
+    if (!isEmpty_String(title_GmDocument(d->view.doc))) {
+        return title_GmDocument(d->view.doc);
     }
     return bookmarkTitle_DocumentWidget(d);
 }
 
 const iString *bookmarkTitle_DocumentWidget(const iDocumentWidget *d) {
     iStringArray *title = iClob(new_StringArray());
-    if (!isEmpty_String(title_GmDocument(d->doc))) {
-        pushBack_StringArray(title, title_GmDocument(d->doc));
+    if (!isEmpty_String(title_GmDocument(d->view.doc))) {
+        pushBack_StringArray(title, title_GmDocument(d->view.doc));
     }
     if (!isEmpty_String(d->titleUser)) {
         pushBack_StringArray(title, d->titleUser);
@@ -5258,30 +5773,19 @@ void deserializeState_DocumentWidget(iDocumentWidget *d, iStream *ins) {
     updateFromHistory_DocumentWidget_(d);
 }
 
-static void setUrl_DocumentWidget_(iDocumentWidget *d, const iString *url) {
-    url = canonicalUrl_String(url);
-    if (!equal_String(d->mod.url, url)) {
-        d->flags |= urlChanged_DocumentWidgetFlag;
-        set_String(d->mod.url, url);
-    }
-}
-
 void setUrlFlags_DocumentWidget(iDocumentWidget *d, const iString *url, int setUrlFlags) {
-    iChangeFlags(d->flags, openedFromSidebar_DocumentWidgetFlag,
-                 (setUrlFlags & openedFromSidebar_DocumentWidgetSetUrlFlag) != 0);
-    const iBool isFromCache = (setUrlFlags & useCachedContentIfAvailable_DocumentWidgetSetUrlFlag) != 0;
+    const iBool allowCache = (setUrlFlags & useCachedContentIfAvailable_DocumentWidgetSetUrlFlag) != 0;
     setLinkNumberMode_DocumentWidget_(d, iFalse);
     setUrl_DocumentWidget_(d, urlFragmentStripped_String(url));
     /* See if there a username in the URL. */
     parseUser_DocumentWidget_(d);
-    if (!isFromCache || !updateFromHistory_DocumentWidget_(d)) {
+    if (!allowCache || !updateFromHistory_DocumentWidget_(d)) {
         fetch_DocumentWidget_(d);
     }
 }
 
 void setUrlAndSource_DocumentWidget(iDocumentWidget *d, const iString *url, const iString *mime,
                                     const iBlock *source) {
-    d->flags &= ~openedFromSidebar_DocumentWidgetFlag;
     setLinkNumberMode_DocumentWidget_(d, iFalse);
     setUrl_DocumentWidget_(d, url);
     parseUser_DocumentWidget_(d);
@@ -5291,18 +5795,26 @@ void setUrlAndSource_DocumentWidget(iDocumentWidget *d, const iString *url, cons
     set_String(&resp->meta, mime);
     set_Block(&resp->body, source);
     updateFromCachedResponse_DocumentWidget_(d, 0, resp, NULL);
+    updateBanner_DocumentWidget_(d);
     delete_GmResponse(resp);
 }
 
 iDocumentWidget *duplicate_DocumentWidget(const iDocumentWidget *orig) {
     iDocumentWidget *d = new_DocumentWidget();
     delete_History(d->mod.history);
-    d->initNormScrollY = normScrollPos_DocumentWidget_(d);
+    d->initNormScrollY = normScrollPos_DocumentView_(&d->view);
     d->mod.history = copy_History(orig->mod.history);
     setUrlFlags_DocumentWidget(d, orig->mod.url, useCachedContentIfAvailable_DocumentWidgetSetUrlFlag);
     return d;
 }
 
+void setOrigin_DocumentWidget(iDocumentWidget *d, const iDocumentWidget *other) {
+    if (d != other) {
+        /* TODO: Could remember the other's ID? */
+        set_String(&d->linePrecedingLink, &other->linePrecedingLink);
+    }
+}
+
 void setUrl_DocumentWidget(iDocumentWidget *d, const iString *url) {
     setUrlFlags_DocumentWidget(d, url, 0);
 }
@@ -5315,11 +5827,6 @@ void setRedirectCount_DocumentWidget(iDocumentWidget *d, int count) {
     d->redirectCount = count;
 }
 
-void setOpenedFromSidebar_DocumentWidget(iDocumentWidget *d, iBool fromSidebar) {
-    iChangeFlags(d->flags, openedFromSidebar_DocumentWidgetFlag, fromSidebar);
-//    setCachedDocument_History(d->mod.history, d->doc, fromSidebar);
-}
-
 iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
     return d->request != NULL;
 }
@@ -5327,7 +5834,7 @@ iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
 void takeRequest_DocumentWidget(iDocumentWidget *d, iGmRequest *finishedRequest) {
     cancelRequest_DocumentWidget_(d, iFalse /* don't post anything */);
     const iString *url = url_GmRequest(finishedRequest);
-    
+
     add_History(d->mod.history, url);
     setUrl_DocumentWidget_(d, url);
     d->state = fetching_RequestState;
@@ -5341,27 +5848,17 @@ void takeRequest_DocumentWidget(iDocumentWidget *d, iGmRequest *finishedRequest)
 }
 
 void updateSize_DocumentWidget(iDocumentWidget *d) {
-    updateDocumentWidthRetainingScrollPosition_DocumentWidget_(d, iFalse);
-    resetWideRuns_DocumentWidget_(d);
-    d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
-    updateVisible_DocumentWidget_(d);
-    setWidth_Banner(d->banner, documentWidth_DocumentWidget(d));
+    iDocumentView *view = &d->view;
+    updateDocumentWidthRetainingScrollPosition_DocumentView_(view, iFalse);
+    resetWideRuns_DocumentView_(view);
+    view->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
+    updateVisible_DocumentView_(view);
+    setWidth_Banner(d->banner, documentWidth_DocumentView_(view));
     invalidate_DocumentWidget_(d);
     arrange_Widget(d->footerButtons);
 }
 
-#if 0
-static void sizeChanged_DocumentWidget_(iDocumentWidget *d) {
-    if (current_Root()) {
-        /* TODO: This gets called more than once during a single arrange.
-           It could be done via some sort of callback instead. */
-        updateVisible_DocumentWidget_(d);
-    }
-}
-#endif
-
 iBeginDefineSubclass(DocumentWidget, Widget)
     .processEvent = (iAny *) processEvent_DocumentWidget_,
     .draw         = (iAny *) draw_DocumentWidget_,
-//    .sizeChanged  = (iAny *) sizeChanged_DocumentWidget_,
 iEndDefineSubclass(DocumentWidget)
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 2df3392b..1bee8351 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -48,21 +48,17 @@ const iString *     bookmarkTitle_DocumentWidget    (const iDocumentWidget *);
 const iString *     feedTitle_DocumentWidget        (const iDocumentWidget *);
 int                 documentWidth_DocumentWidget    (const iDocumentWidget *);
 
-//iBool   findCachedContent_DocumentWidget(const iDocumentWidget *, const iString *url,
-//                                         iString *mime_out, iBlock *data_out);
-
 enum iDocumentWidgetSetUrlFlags {
     useCachedContentIfAvailable_DocumentWidgetSetUrlFlag = iBit(1),
-    openedFromSidebar_DocumentWidgetSetUrlFlag = iBit(2),
 };
 
+void    setOrigin_DocumentWidget        (iDocumentWidget *, const iDocumentWidget *other);
 void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFlags_DocumentWidget      (iDocumentWidget *, const iString *url, int setUrlFlags);
 void    setUrlAndSource_DocumentWidget  (iDocumentWidget *, const iString *url, const iString *mime, const iBlock *source);
 void    setInitialScroll_DocumentWidget (iDocumentWidget *, float normScrollY); /* set after content received */
 void    setRedirectCount_DocumentWidget (iDocumentWidget *, int count);
 void    setSource_DocumentWidget        (iDocumentWidget *, const iString *sourceText);
-void    setOpenedFromSidebar_DocumentWidget(iDocumentWidget *, iBool fromSidebar);
 
 void    takeRequest_DocumentWidget      (iDocumentWidget *, iGmRequest *finishedRequest); /* ownership given */
 
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index a1fb8cb5..9261da0c 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -20,6 +20,10 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
+/* InputWidget supports both fully custom and system-provided text editing.
+   The primary source of complexity is the handling of wrapped text content
+   in the custom text editor. */
+
 #include "inputwidget.h"
 #include "command.h"
 #include "paint.h"
@@ -40,10 +44,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #   include "macos.h"
 #endif
 
+#if defined (iPlatformAppleMobile)
+#   include "ios.h"
+#   define LAGRANGE_USE_SYSTEM_TEXT_INPUT 1 /* System-provided UI control almost handles everything. */
+#else
+#   define LAGRANGE_USE_SYSTEM_TEXT_INPUT 0
+iDeclareType(SystemTextInput)
+#endif
+
 static const int    refreshInterval_InputWidget_ = 512;
 static const size_t maxUndo_InputWidget_         = 64;
 static const int    unlimitedWidth_InputWidget_  = 1000000; /* TODO: WrapText disables some functionality if maxWidth==0 */
 
+static const iChar  sensitiveChar_ = 0x25cf;   /* black circle */
+static const char * sensitive_     = "\u25cf";
+
+#define minWidth_InputWidget_   (3 * gap_UI)
+
 static void enableEditorKeysInMenus_(iBool enable) {
 #if defined (iPlatformAppleDesktop)
     enableMenuItemsByKey_MacOS(SDLK_LEFT,  KMOD_PRIMARY, enable);
@@ -57,7 +74,10 @@ static void enableEditorKeysInMenus_(iBool enable) {
 #endif
 }
 
+static void updateMetrics_InputWidget_(iInputWidget *);
+
 /*----------------------------------------------------------------------------------------------*/
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 
 iDeclareType(InputLine)
 
@@ -178,6 +198,8 @@ static void deinit_InputUndo_(iInputUndo *d) {
     deinit_String(&d->text);
 }
 
+#endif /* USE_SYSTEM_TEXT_INPUT */
+
 enum iInputWidgetFlag {
     isSensitive_InputWidgetFlag          = iBit(1),
     isUrl_InputWidgetFlag                = iBit(2), /* affected by decoding preference */
@@ -203,41 +225,54 @@ enum iInputWidgetFlag {
 struct Impl_InputWidget {
     iWidget         widget;
     enum iInputMode mode;
+    int             font;
     int             inFlags;
     size_t          maxLen;  /* characters */
-    iArray          lines;   /* iInputLine[] */
-    iString         oldText; /* for restoring if edits cancelled */
-    int             lastUpdateWidth;
     iString         srcHint;
     iString         hint;
-    int             leftPadding;
+    int             leftPadding; /* additional padding between frame and content */
     int             rightPadding;
+    int             minWrapLines, maxWrapLines; /* min/max number of visible lines allowed */
+    iRangei         visWrapLines; /* which wrap lines are current visible */
+    iClick          click;
+    int             wheelAccum;
+    iTextBuf *      buffered; /* pre-rendered static text */
+    iInputWidgetValidatorFunc validator;
+    void *          validatorContext;
+    iString *       backupPath;
+    int             backupTimer;
+    iString         oldText; /* for restoring if edits cancelled */
+    int             lastUpdateWidth;
+    uint32_t        lastOverflowScrollTime; /* scrolling to show focused widget */
+    iSystemTextInput *sysCtrl;
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    iString         text;
+#else
+    iArray          lines;        /* iInputLine[] */
     iInt2           cursor;       /* cursor position: x = byte offset, y = line index */
     iInt2           prevCursor;   /* previous cursor position */
-    iRangei         visWrapLines; /* which wrap lines are current visible */
-    int             minWrapLines, maxWrapLines; /* min/max number of visible lines allowed */
     iRanges         mark;         /* TODO: would likely simplify things to use two Int2's for marking; no conversions needed */
     iRanges         initialMark;
     iArray          undoStack;
-    int             font;
-    iClick          click;
     uint32_t        tapStartTime;
     uint32_t        lastTapTime;
     iInt2           lastTapPos;
     int             tapCount;
-    int             wheelAccum;
     int             cursorVis;
     uint32_t        timer;
-    iTextBuf *      buffered; /* pre-rendered static text */
-    iInputWidgetValidatorFunc validator;
-    void *          validatorContext;
-    iString *       backupPath;
-    int             backupTimer;
+#endif
 };
 
 iDefineObjectConstructionArgs(InputWidget, (size_t maxLen), maxLen)
 
-static void updateMetrics_InputWidget_(iInputWidget *);
+static int extraPaddingHeight_InputWidget_(const iInputWidget *d) {
+    if ((isPortraitPhone_App() || deviceType_App() == tablet_AppDeviceType) &&
+        !cmp_String(id_Widget(&d->widget), "url")) {
+        /* Make the tap target more generous. */
+        return 2.5f * gap_UI;
+    }
+    return 1.25f * gap_UI;
+}
 
 static void restoreBackup_InputWidget_(iInputWidget *d) {
     if (!d->backupPath) return;
@@ -252,17 +287,21 @@ static void saveBackup_InputWidget_(iInputWidget *d) {
     if (!d->backupPath) return;
     iFile *f = new_File(d->backupPath);
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+        write_File(f, utf8_String(&d->text));
+#else
         iConstForEach(Array, i, &d->lines) {
             const iInputLine *line = i.value;
             write_File(f, utf8_String(&line->text));
         }
-        d->inFlags &= ~needBackup_InputWidgetFlag;
-#if !defined (NDEBUG)
+#   if !defined (NDEBUG)
         iConstForEach(Array, j, &d->lines) {
             iAssert(endsWith_String(&((const iInputLine *) j.value)->text, "\n") ||
                     index_ArrayConstIterator(&j) == size_Array(&d->lines) - 1);
         }
+#   endif
 #endif
+        d->inFlags &= ~needBackup_InputWidgetFlag;
     }
     iRelease(f);
 }
@@ -311,6 +350,12 @@ void setBackupFileName_InputWidget(iInputWidget *d, const char *fileName) {
     restoreBackup_InputWidget_(d);
 }
 
+iLocalDef iInt2 padding_(void) {
+    return init_I2(gap_UI / 2, gap_UI / 2);
+}
+
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+
 static void clearUndo_InputWidget_(iInputWidget *d) {
     iForEach(Array, i, &d->undoStack) {
         deinit_InputUndo_(i.value);
@@ -318,11 +363,12 @@ static void clearUndo_InputWidget_(iInputWidget *d) {
     clear_Array(&d->undoStack);
 }
 
-iLocalDef iInt2 padding_(void) {
-    return init_I2(gap_UI / 2, gap_UI / 2);
+static const iInputLine *line_InputWidget_(const iInputWidget *d, size_t index) {
+    iAssert(!isEmpty_Array(&d->lines));
+    return constAt_Array(&d->lines, index);
 }
 
-#define extraPaddingHeight_ (1.25f * gap_UI)
+#endif /* !LAGRANGE_USE_SYSTEM_TEXT_INPUT */
 
 static iRect contentBounds_InputWidget_(const iInputWidget *d) {
     const iWidget *w      = constAs_Widget(d);
@@ -332,11 +378,39 @@ static iRect contentBounds_InputWidget_(const iInputWidget *d) {
     shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
     bounds.pos.y += padding_().y / 2;
     if (flags_Widget(w) & extraPadding_WidgetFlag) {
-        bounds.pos.y += extraPaddingHeight_ / 2;
+        if (d->sysCtrl && !cmp_String(id_Widget(w), "url")) {
+            /* TODO: This is super hacky: the native UI control would be offset incorrectly.
+               These paddings/offsets are getting a bit ridiculous, should rethink the whole thing.
+               Use the Widget paddings! */
+            bounds.pos.y += 1.25f * gap_UI / 2;
+        }
+        else {
+            bounds.pos.y += extraPaddingHeight_InputWidget_(d) / 2;
+        }
     }
     return bounds;
 }
 
+static iWrapText wrap_InputWidget_(const iInputWidget *d, int y) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    iUnused(y); /* full text is wrapped always */
+    iRangecc text = range_String(&d->text);
+#else
+    iRangecc text = range_String(&line_InputWidget_(d, y)->text);
+#endif
+    return (iWrapText){
+        .text = text,
+        .maxWidth = d->maxLen == 0 ? iMaxi(minWidth_InputWidget_,
+                                           width_Rect(contentBounds_InputWidget_(d)))
+                                   : unlimitedWidth_InputWidget_,
+        .mode =
+            (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode : word_WrapTextMode),
+        .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
+    };
+}
+
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+
 iLocalDef iBool isLastLine_InputWidget_(const iInputWidget *d, const iInputLine *line) {
     return (const void *) line == constBack_Array(&d->lines);
 }
@@ -350,11 +424,6 @@ static int numWrapLines_InputWidget_(const iInputWidget *d) {
     return lastLine_InputWidget_(d)->wrapLines.end;
 }
 
-static const iInputLine *line_InputWidget_(const iInputWidget *d, size_t index) {
-    iAssert(!isEmpty_Array(&d->lines));
-    return constAt_Array(&d->lines, index);
-}
-
 static const iString *lineString_InputWidget_(const iInputWidget *d, int y) {
     return &line_InputWidget_(d, y)->text;
 }
@@ -455,20 +524,6 @@ static int visLineOffsetY_InputWidget_(const iInputWidget *d) {
            d->wheelAccum;
 }
 
-static const iChar sensitiveChar_ = 0x25cf;   /* black circle */
-static const char *sensitive_     = "\u25cf";
-
-static iWrapText wrap_InputWidget_(const iInputWidget *d, int y) {
-    return (iWrapText){
-        .text     = range_String(&line_InputWidget_(d, y)->text),
-        .maxWidth = d->maxLen == 0 ? width_Rect(contentBounds_InputWidget_(d))
-                                   : unlimitedWidth_InputWidget_,
-        .mode =
-            (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode : word_WrapTextMode),
-        .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
-    };
-}
-
 static iRangei visibleLineRange_InputWidget_(const iInputWidget *d) {
     iRangei vis = { -1, -1 };
     /* Determine which lines are in the potentially visible range. */
@@ -518,6 +573,9 @@ static iInt2 relativeCursorCoord_InputWidget_(const iInputWidget *d) {
 }
 
 static void updateVisible_InputWidget_(iInputWidget *d) {
+    if (width_Widget(d) == 0) {
+        return; /* Nothing to do yet. */
+    }
     const int totalWraps = numWrapLines_InputWidget_(d);
     const int visWraps = iClamp(totalWraps, d->minWrapLines, d->maxWrapLines);
     /* Resize the height of the editor. */
@@ -535,15 +593,24 @@ static void updateVisible_InputWidget_(iInputWidget *d) {
     else if (cursorY < d->visWrapLines.start) {
         delta = cursorY - d->visWrapLines.start;
     }
+    if (d->visWrapLines.end + delta > totalWraps) {
+        /* Don't scroll past the bottom. */
+        delta = totalWraps - d->visWrapLines.end;
+    }
+    if (d->visWrapLines.start + delta < 0) {
+        /* Don't ever scroll above the top. */
+        delta = -d->visWrapLines.start;
+    }
     d->visWrapLines.start += delta;
     d->visWrapLines.end   += delta;
-    iAssert(contains_Range(&d->visWrapLines, cursorY));
+//    iAssert(contains_Range(&d->visWrapLines, cursorY));
     if (!isFocused_Widget(d) && d->maxWrapLines == 1) {
         d->visWrapLines.start = 0;
         d->visWrapLines.end = 1;
     }
 //    printf("[InputWidget %p] total:%d viswrp:%d cur:%d vis:%d..%d\n",
 //           d, totalWraps, visWraps, d->cursor.y, d->visWrapLines.start, d->visWrapLines.end);
+//    fflush(stdout);
 }
 
 static void showCursor_InputWidget_(iInputWidget *d) {
@@ -551,6 +618,19 @@ static void showCursor_InputWidget_(iInputWidget *d) {
     updateVisible_InputWidget_(d);
 }
 
+#else /* if LAGRANGE_USE_SYSTEM_TEXT_INPUT */
+
+static int visLineOffsetY_InputWidget_(const iInputWidget *d) {
+    return 0; /* offset for the buffered text */
+}
+
+static void updateVisible_InputWidget_(iInputWidget *d) {
+    iUnused(d);
+    /* TODO: Anything to do? */
+}
+
+#endif
+
 static void invalidateBuffered_InputWidget_(iInputWidget *d) {
     if (d->buffered) {
         delete_TextBuf(d->buffered);
@@ -563,7 +643,7 @@ static void updateSizeForFixedLength_InputWidget_(iInputWidget *d) {
         /* Set a fixed size based on maximum possible width of the text. */
         iBlock *content = new_Block(d->maxLen);
         fill_Block(content, 'M');
-        int extraHeight = (flags_Widget(as_Widget(d)) & extraPadding_WidgetFlag ? extraPaddingHeight_ : 0);
+        int extraHeight = (flags_Widget(as_Widget(d)) & extraPadding_WidgetFlag ? extraPaddingHeight_InputWidget_(d) : 0);
         setFixedSize_Widget(
             as_Widget(d),
             add_I2(measure_Text(d->font, cstr_Block(content)).bounds.size,
@@ -574,11 +654,16 @@ static void updateSizeForFixedLength_InputWidget_(iInputWidget *d) {
 }
 
 static iString *text_InputWidget_(const iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    return copy_String(&d->text);
+#else
     iString *text = new_String();
     mergeLines_(&d->lines, text);
     return text;
+#endif
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static size_t length_InputWidget_(const iInputWidget *d) {
     /* Note: `d->length` is kept up to date, so don't call this normally. */
     size_t len = 0;
@@ -589,37 +674,10 @@ static size_t length_InputWidget_(const iInputWidget *d) {
     return len;
 }
 
-static int contentHeight_InputWidget_(const iInputWidget *d) {
-    return size_Range(&d->visWrapLines) * lineHeight_Text(d->font);
-}
-
-static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
-#if !defined (iPlatformAppleMobile)
-    const iRect bounds = bounds_Widget(constAs_Widget(d));
-    SDL_SetTextInputRect(&(SDL_Rect){ bounds.pos.x, bounds.pos.y, bounds.size.x, bounds.size.y });
-#endif
-}
-
-static void updateMetrics_InputWidget_(iInputWidget *d) {
-    iWidget *w = as_Widget(d);
-    updateSizeForFixedLength_InputWidget_(d);
-    /* Caller must arrange the width, but the height is set here. */
-    const int oldHeight = height_Rect(w->rect);
-    w->rect.size.y = contentHeight_InputWidget_(d) + 3.0f * padding_().y; /* TODO: Why 3x? */
-    if (flags_Widget(w) & extraPadding_WidgetFlag) {
-        w->rect.size.y += extraPaddingHeight_;
-    }
-    invalidateBuffered_InputWidget_(d);
-    if (height_Rect(w->rect) != oldHeight) {
-        postCommand_Widget(d, "input.resized");
-        updateTextInputRect_InputWidget_(d);
-    }
-}
-
 static void updateLine_InputWidget_(iInputWidget *d, iInputLine *line) {
     iAssert(endsWith_String(&line->text, "\n") || isLastLine_InputWidget_(d, line));
     iWrapText wrapText = wrap_InputWidget_(d, indexOf_Array(&d->lines, line));
-    if (wrapText.maxWidth <= 0) {
+    if (wrapText.maxWidth <= minWidth_InputWidget_) {
         line->wrapLines.end = line->wrapLines.start + 1;
         return;
     }
@@ -668,7 +726,10 @@ static uint32_t cursorTimer_(uint32_t interval, void *w) {
     return interval;
 }
 
-static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, iBool doStart) {
+static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, int doStart) {
+    if (!prefs_App()->blinkingCursor && doStart == 1) {
+        doStart = iFalse;
+    }
     if (doStart && !d->timer) {
         d->timer = SDL_AddTimer(refreshInterval_InputWidget_, cursorTimer_, d);
     }
@@ -678,6 +739,66 @@ static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, iBool doStart)
     }
 }
 
+#else /* using a system-provided text control */
+
+static void updateAllLinesAndResizeHeight_InputWidget_(iInputWidget *d) {
+    /* Rewrap the buffered text and resize accordingly. */
+    iWrapText wt = wrap_InputWidget_(d, 0);
+    /* TODO: Set max lines limit for WrapText. */
+    const int height = measure_WrapText(&wt, d->font).bounds.size.y;
+    /* We use this to store the number wrapped lines for determining widget height. */
+    d->visWrapLines.start = 0;
+    d->visWrapLines.end = iMax(d->minWrapLines,
+                               iMin(d->maxWrapLines, height / lineHeight_Text(d->font)));
+    updateMetrics_InputWidget_(d);
+}
+
+#endif
+
+static int contentHeight_InputWidget_(const iInputWidget *d) {
+    const int lineHeight = lineHeight_Text(d->font);
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    const int minHeight = d->minWrapLines * lineHeight;
+    const int maxHeight = d->maxWrapLines * lineHeight;
+    if (d->sysCtrl) {
+        const int preferred = (preferredHeight_SystemTextInput(d->sysCtrl) + gap_UI) / lineHeight;
+        return iClamp(preferred * lineHeight, minHeight, maxHeight);
+    }
+    if (d->buffered && ~d->inFlags & needUpdateBuffer_InputWidgetFlag) {
+        return iClamp(d->buffered->size.y, minHeight, maxHeight);
+    }
+#endif
+    return (int) size_Range(&d->visWrapLines) * lineHeight;
+}
+
+static void updateTextInputRect_InputWidget_(const iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    if (d->sysCtrl) {
+        setRect_SystemTextInput(d->sysCtrl, contentBounds_InputWidget_(d));
+    }
+#endif
+#if !defined (iPlatformAppleMobile)
+    const iRect bounds = bounds_Widget(constAs_Widget(d));
+    SDL_SetTextInputRect(&(SDL_Rect){ bounds.pos.x, bounds.pos.y, bounds.size.x, bounds.size.y });
+#endif
+}
+
+static void updateMetrics_InputWidget_(iInputWidget *d) {
+    iWidget *w = as_Widget(d);
+    updateSizeForFixedLength_InputWidget_(d);
+    /* Caller must arrange the width, but the height is set here. */
+    const int oldHeight = height_Rect(w->rect);
+    w->rect.size.y = contentHeight_InputWidget_(d) + 3.0f * padding_().y; /* TODO: Why 3x? */
+    if (flags_Widget(w) & extraPadding_WidgetFlag) {
+        w->rect.size.y += extraPaddingHeight_InputWidget_(d);
+    }
+    invalidateBuffered_InputWidget_(d);
+    if (height_Rect(w->rect) != oldHeight) {
+        postCommand_Widget(d, "input.resized");
+        updateTextInputRect_InputWidget_(d);
+    }
+}
+
 void init_InputWidget(iInputWidget *d, size_t maxLen) {
     iWidget *w = &d->widget;
     init_Widget(w);
@@ -687,40 +808,44 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
 #if defined (iPlatformMobile)
     setFlags_Widget(w, extraPadding_WidgetFlag, iTrue);
 #endif
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    init_String(&d->text);
+#else
     init_Array(&d->lines, sizeof(iInputLine));
+    init_Array(&d->undoStack, sizeof(iInputUndo));
+    d->cursor       = zero_I2();
+    d->prevCursor   = zero_I2();
+    d->lastTapTime  = 0;
+    d->tapCount     = 0;
+    d->timer        = 0;
+    d->cursorVis    = 0;
+    iZap(d->mark);
+    splitToLines_(&iStringLiteral(""), &d->lines);
+#endif
     init_String(&d->oldText);
-    init_Array(&d->lines, sizeof(iInputLine));
     init_String(&d->srcHint);
     init_String(&d->hint);
-    init_Array(&d->undoStack, sizeof(iInputUndo));
     d->font         = uiInput_FontId | alwaysVariableFlag_FontId;
     d->leftPadding  = 0;
     d->rightPadding = 0;
-    d->cursor       = zero_I2();
-    d->prevCursor   = zero_I2();
     d->lastUpdateWidth = 0;
     d->inFlags         = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag |
                          lineBreaksEnabled_InputWidgetFlag | useReturnKeyBehavior_InputWidgetFlag;
     //    if (deviceType_App() != desktop_AppDeviceType) {
     //        d->inFlags |= enterKeyInsertsLineFeed_InputWidgetFlag;
     //    }
-    iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
     d->visWrapLines.start = 0;
     d->visWrapLines.end = 1;
     d->maxWrapLines = maxLen > 0 ? 1 : 20; /* TODO: Choose maximum dynamically? */
     d->minWrapLines = 1;
-    splitToLines_(&iStringLiteral(""), &d->lines);
     setFlags_Widget(w, fixedHeight_WidgetFlag, iTrue); /* resizes its own height */
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
-    d->lastTapTime = 0;
-    d->tapCount = 0;
     d->wheelAccum = 0;
-    d->timer = 0;
-    d->cursorVis = 0;
     d->buffered = NULL;
     d->backupPath = NULL;
     d->backupTimer = 0;
+    d->sysCtrl = NULL;
     updateMetrics_InputWidget_(d);
 }
 
@@ -733,26 +858,48 @@ void deinit_InputWidget(iInputWidget *d) {
     }
     delete_String(d->backupPath);
     d->backupPath = NULL;
+    delete_TextBuf(d->buffered);
+    deinit_String(&d->srcHint);
+    deinit_String(&d->hint);
+    deinit_String(&d->oldText);
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    delete_SystemTextInput(d->sysCtrl);
+    deinit_String(&d->text);
+#else
+    startOrStopCursorTimer_InputWidget_(d, iFalse);
     clearInputLines_(&d->lines);
     if (isSelected_Widget(d)) {
         SDL_StopTextInput();
         enableEditorKeysInMenus_(iTrue);
     }
-    delete_TextBuf(d->buffered);
     clearUndo_InputWidget_(d);
     deinit_Array(&d->undoStack);
-    startOrStopCursorTimer_InputWidget_(d, iFalse);
-    deinit_String(&d->srcHint);
-    deinit_String(&d->hint);
-    deinit_String(&d->oldText);
     deinit_Array(&d->lines);
+#endif
+}
+
+static iBool isAllowedToInsertNewline_InputWidget_(const iInputWidget *d) {
+    return ~d->inFlags & isSensitive_InputWidgetFlag &&
+        ~d->inFlags & isUrl_InputWidgetFlag &&
+        d->inFlags & lineBreaksEnabled_InputWidgetFlag && d->maxLen == 0;
 }
 
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+static void updateAfterVisualOffsetChange_InputWidget_(iInputWidget *d, iRoot *root) {
+    iAssert(as_Widget(d)->root == root);
+    iUnused(root);
+    if (d->sysCtrl) {
+        setRect_SystemTextInput(d->sysCtrl, contentBounds_InputWidget_(d));
+    }
+}
+#endif
+
 void setFont_InputWidget(iInputWidget *d, int fontId) {
     d->font = fontId;
     updateMetrics_InputWidget_(d);
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void pushUndo_InputWidget_(iInputWidget *d) {
     iInputUndo undo;
     init_InputUndo_(&undo, &d->lines, d->cursor);
@@ -766,7 +913,6 @@ static void pushUndo_InputWidget_(iInputWidget *d) {
 static iBool popUndo_InputWidget_(iInputWidget *d) {
     if (!isEmpty_Array(&d->undoStack)) {
         iInputUndo *undo = back_Array(&d->undoStack);
-        //setCopy_Array(&d->text, &undo->text);
         splitToLines_(&undo->text, &d->lines);
         d->cursor = undo->cursor;
         deinit_InputUndo_(undo);
@@ -778,6 +924,43 @@ static iBool popUndo_InputWidget_(iInputWidget *d) {
     return iFalse;
 }
 
+iLocalDef iInputLine *cursorLine_InputWidget_(iInputWidget *d) {
+    return at_Array(&d->lines, d->cursor.y);
+}
+
+iLocalDef const iInputLine *constCursorLine_InputWidget_(const iInputWidget *d) {
+    return constAt_Array(&d->lines, d->cursor.y);
+}
+
+iLocalDef iInt2 cursorMax_InputWidget_(const iInputWidget *d) {
+    const int yLast = size_Array(&d->lines) - 1;
+    return init_I2(endX_InputWidget_(d, yLast), yLast);
+}
+
+static size_t cursorToIndex_InputWidget_(const iInputWidget *d, iInt2 pos) {
+    if (pos.y < 0) {
+        return 0;
+    }
+    if (pos.y >= size_Array(&d->lines)) {
+        return lastLine_InputWidget_(d)->range.end;
+    }
+    const iInputLine *line = line_InputWidget_(d, pos.y);
+    pos.x = iClamp(pos.x, 0, endX_InputWidget_(d, pos.y));
+    return line->range.start + pos.x;
+}
+
+static iInt2 indexToCursor_InputWidget_(const iInputWidget *d, size_t index) {
+    /* TODO: The lines are sorted; this could use a binary search. */
+    iConstForEach(Array, i, &d->lines) {
+        const iInputLine *line = i.value;
+        if (contains_Range(&line->range, index)) {
+            return init_I2(index - line->range.start, index_ArrayConstIterator(&i));
+        }
+    }
+    return cursorMax_InputWidget_(d);
+}
+#endif
+
 void setMode_InputWidget(iInputWidget *d, enum iInputMode mode) {
     d->mode = mode;
 }
@@ -876,7 +1059,11 @@ void setContentPadding_InputWidget(iInputWidget *d, int left, int right) {
 }
 
 iLocalDef iBool isEmpty_InputWidget_(const iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    return isEmpty_String(&d->text);
+#else
     return size_Array(&d->lines) == 1 && isEmpty_String(&line_InputWidget_(d, 0)->text);
+#endif
 }
 
 static iBool isHintVisible_InputWidget_(const iInputWidget *d) {
@@ -890,11 +1077,15 @@ static void updateBuffered_InputWidget_(iInputWidget *d) {
     }
     else {
         /* Draw all the potentially visible lines to a buffer. */
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+        iString *visText = copy_String(&d->text);
+#else
         iString *visText = new_String();
         const iRangei visRange = visibleLineRange_InputWidget_(d);
         for (int i = visRange.start; i < visRange.end; i++) {
             append_String(visText, &line_InputWidget_(d, i)->text);
         }
+#endif
         if (d->inFlags & isUrl_InputWidgetFlag) {
             /* Highlight the host name. */
             iUrl parts;
@@ -912,6 +1103,7 @@ static void updateBuffered_InputWidget_(iInputWidget *d) {
             }
         }
         iWrapText wt = wrap_InputWidget_(d, 0);
+        wt.maxLines = d->maxWrapLines;
         wt.text = range_String(visText);
         const int fg = uiInputText_ColorId;
         d->buffered = new_TextBuf(&wt, d->font, fg);
@@ -920,25 +1112,18 @@ static void updateBuffered_InputWidget_(iInputWidget *d) {
     d->inFlags &= ~needUpdateBuffer_InputWidgetFlag;
 }
 
-iLocalDef iInputLine *cursorLine_InputWidget_(iInputWidget *d) {
-    return at_Array(&d->lines, d->cursor.y);
-}
-
-iLocalDef const iInputLine *constCursorLine_InputWidget_(const iInputWidget *d) {
-    return constAt_Array(&d->lines, d->cursor.y);
-}
-
-iLocalDef iInt2 cursorMax_InputWidget_(const iInputWidget *d) {
-    const int yLast = size_Array(&d->lines) - 1;
-    return init_I2(endX_InputWidget_(d, yLast), yLast);
-}
-
 void setText_InputWidget(iInputWidget *d, const iString *text) {
     if (!d) return;
     if (d->inFlags & isUrl_InputWidgetFlag) {
-        /* If user wants URLs encoded, also Punycode the domain. */
-        if (!prefs_App()->decodeUserVisibleURLs) {
+        if (prefs_App()->decodeUserVisibleURLs) {
+            iString *enc = collect_String(copy_String(text));
+            urlDecodePath_String(enc);
+            text = enc;
+        }
+        else {
+            /* The user wants URLs encoded, also Punycode the domain. */
             iString *enc = collect_String(copy_String(text));
+            urlEncodePath_String(enc);
             /* Prevent address bar spoofing (mentioned as IDN homograph attack in
                https://github.com/skyjake/lagrange/issues/73) */
             punyEncodeUrlHost_String(enc);
@@ -949,9 +1134,10 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
             text = omitDefaultScheme_(collect_String(copy_String(text)));
         }
     }
-    clearUndo_InputWidget_(d);
     iString *nfcText = collect_String(copy_String(text));
     normalize_String(nfcText);
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    clearUndo_InputWidget_(d);
     splitToLines_(nfcText, &d->lines);
     iAssert(!isEmpty_Array(&d->lines));
     iForEach(Array, i, &d->lines) {
@@ -962,12 +1148,23 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
     if (!isFocused_Widget(d)) {
         iZap(d->mark);
     }
+#else
+    set_String(&d->text, nfcText);
+    if (d->sysCtrl) {
+        setText_SystemTextInput(d->sysCtrl, nfcText, iTrue);
+    }
+    else {
+        updateAllLinesAndResizeHeight_InputWidget_(d); /* need to know the new height */
+    }
+#endif
     if (!isFocused_Widget(d)) {
         d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     }
     updateVisible_InputWidget_(d);
     updateMetrics_InputWidget_(d);
-    refresh_Widget(as_Widget(d));
+    if (!d->sysCtrl) {
+        refresh_Widget(as_Widget(d));
+    }
 }
 
 void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
@@ -976,38 +1173,39 @@ void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
     delete_String(str);
 }
 
-static size_t cursorToIndex_InputWidget_(const iInputWidget *d, iInt2 pos) {
-    if (pos.y < 0) {
-        return 0;
-    }
-    if (pos.y >= size_Array(&d->lines)) {
-        return lastLine_InputWidget_(d)->range.end;
-    }
-    const iInputLine *line = line_InputWidget_(d, pos.y);
-    pos.x = iClamp(pos.x, 0, endX_InputWidget_(d, pos.y));
-    return line->range.start + pos.x;
-}
-
-static iInt2 indexToCursor_InputWidget_(const iInputWidget *d, size_t index) {
-    /* TODO: The lines are sorted; this could use a binary search. */
-    iConstForEach(Array, i, &d->lines) {
-        const iInputLine *line = i.value;
-        if (contains_Range(&line->range, index)) {
-            return init_I2(index - line->range.start, index_ArrayConstIterator(&i));
-        }
-    }
-    return cursorMax_InputWidget_(d);
-}
-
 void selectAll_InputWidget(iInputWidget *d) {
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    if (d->sysCtrl) {
+        selectAll_SystemTextInput(d->sysCtrl);
+    }
+#else
     d->mark = (iRanges){ 0, lastLine_InputWidget_(d)->range.end };
     refresh_Widget(as_Widget(d));
+#endif
+}
+
+void validate_InputWidget(iInputWidget *d) {
+    if (d->validator) {
+        d->validator(d, d->validatorContext); /* this may change the contents */
+    }    
 }
 
 iLocalDef iBool isEditing_InputWidget_(const iInputWidget *d) {
     return (flags_Widget(constAs_Widget(d)) & selected_WidgetFlag) != 0;
 }
 
+static void contentsWereChanged_InputWidget_(iInputWidget *);
+
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+void systemInputChanged_InputWidget_(iSystemTextInput *sysCtrl, void *widget) {
+    iInputWidget *d = widget;
+    set_String(&d->text, text_SystemTextInput(sysCtrl));
+    restartBackupTimer_InputWidget_(d);
+    contentsWereChanged_InputWidget_(d);
+    updateMetrics_InputWidget_(d);
+}
+#endif
+
 void begin_InputWidget(iInputWidget *d) {
     iWidget *w = as_Widget(d);
     if (isEditing_InputWidget_(d)) {
@@ -1016,6 +1214,29 @@ void begin_InputWidget(iInputWidget *d) {
     }
     invalidateBuffered_InputWidget_(d);
     setFlags_Widget(w, hidden_WidgetFlag | disabled_WidgetFlag, iFalse);
+    setFlags_Widget(w, selected_WidgetFlag, iTrue);
+    d->inFlags &= ~enterPressed_InputWidgetFlag;
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    set_String(&d->oldText, &d->text);
+    d->sysCtrl = new_SystemTextInput(
+        contentBounds_InputWidget_(d),
+        (d->maxWrapLines > 1 ? multiLine_SystemTextInputFlags : 0) |
+            (d->inFlags & isUrl_InputWidgetFlag ? (disableAutocorrect_SystemTextInputFlag |
+                                                   disableAutocapitalize_SystemTextInputFlag)
+                                                : 0) |
+            /* widget-specific tweaks (hacks) */
+            (!cmp_String(id_Widget(w), "url") ? returnGo_SystemTextInputFlags : 0) |
+            (!cmp_String(id_Widget(w), "upload.text") ? extraPadding_SystemTextInputFlag : 0) |
+            (flags_Widget(w) & alignRight_WidgetFlag ? alignRight_SystemTextInputFlag : 0) |
+            (isAllowedToInsertNewline_InputWidget_(d) ? insertNewlines_SystemTextInputFlag : 0) |
+            (d->inFlags & selectAllOnFocus_InputWidgetFlag ? selectAll_SystemTextInputFlags : 0));
+    setFont_SystemTextInput(d->sysCtrl, d->font);
+    setText_SystemTextInput(d->sysCtrl, &d->oldText, iFalse);
+    setTextChangedFunc_SystemTextInput(d->sysCtrl, systemInputChanged_InputWidget_, d);
+    iConnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
+    updateTextInputRect_InputWidget_(d);
+    updateMetrics_InputWidget_(d);
+#else
     mergeLines_(&d->lines, &d->oldText);
     if (d->mode == overwrite_InputMode) {
         d->cursor = zero_I2();
@@ -1025,11 +1246,9 @@ void begin_InputWidget(iInputWidget *d) {
         d->cursor.x = iMin(d->cursor.x, cursorLine_InputWidget_(d)->range.end);
     }
     SDL_StartTextInput();
-    setFlags_Widget(w, selected_WidgetFlag, iTrue);
     showCursor_InputWidget_(d);
     refresh_Widget(w);
     startOrStopCursorTimer_InputWidget_(d, iTrue);
-    d->inFlags &= ~enterPressed_InputWidgetFlag;
     if (d->inFlags & selectAllOnFocus_InputWidgetFlag) {
         d->mark = (iRanges){ 0, lastLine_InputWidget_(d)->range.end };
         d->cursor = cursorMax_InputWidget_(d);
@@ -1040,6 +1259,7 @@ void begin_InputWidget(iInputWidget *d) {
     enableEditorKeysInMenus_(iFalse);
     updateTextInputRect_InputWidget_(d);
     updateVisible_InputWidget_(d);
+#endif
 }
 
 void end_InputWidget(iInputWidget *d, iBool accept) {
@@ -1048,15 +1268,29 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
         /* Was not active. */
         return;
     }
-    enableEditorKeysInMenus_(iTrue);
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    if (d->sysCtrl) {
+        iDisconnect(Root, w->root, visualOffsetsChanged, d, updateAfterVisualOffsetChange_InputWidget_);
+        if (accept) {
+            set_String(&d->text, text_SystemTextInput(d->sysCtrl));
+        }
+        else {
+            set_String(&d->text, &d->oldText);
+        }
+        delete_SystemTextInput(d->sysCtrl);
+        d->sysCtrl = NULL;
+    }
+#else
     if (!accept) {
         /* Overwrite the edited lines. */
         splitToLines_(&d->oldText, &d->lines);
     }
-    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
+    SDL_StopTextInput();
+    enableEditorKeysInMenus_(iTrue);
     d->inFlags &= ~isMarking_InputWidgetFlag;
     startOrStopCursorTimer_InputWidget_(d, iFalse);
-    SDL_StopTextInput();
+#endif
+    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     setFlags_Widget(w, selected_WidgetFlag | keepOnTop_WidgetFlag | touchDrag_WidgetFlag, iFalse);
     const char *id = cstr_String(id_Widget(as_Widget(d)));
     if (!*id) id = "_";
@@ -1068,6 +1302,7 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
                        accept ? 1 : 0);
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void textOfLinesWasChanged_InputWidget_(iInputWidget *d, iRangei lineRange) {
     for (int i = lineRange.start; i < lineRange.end; i++) {
         updateLine_InputWidget_(d, at_Array(&d->lines, i));
@@ -1201,27 +1436,6 @@ static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir, int horiz)
     return iTrue;
 }
 
-void setSensitiveContent_InputWidget(iInputWidget *d, iBool isSensitive) {
-    iChangeFlags(d->inFlags, isSensitive_InputWidgetFlag, isSensitive);
-}
-
-void setUrlContent_InputWidget(iInputWidget *d, iBool isUrl) {
-    iChangeFlags(d->inFlags, isUrl_InputWidgetFlag, isUrl);
-    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
-}
-
-void setSelectAllOnFocus_InputWidget(iInputWidget *d, iBool selectAllOnFocus) {
-    iChangeFlags(d->inFlags, selectAllOnFocus_InputWidgetFlag, selectAllOnFocus);
-}
-
-void setNotifyEdits_InputWidget(iInputWidget *d, iBool notifyEdits) {
-    iChangeFlags(d->inFlags, notifyEdits_InputWidgetFlag, notifyEdits);
-}
-
-void setEatEscape_InputWidget(iInputWidget *d, iBool eatEscape) {
-    iChangeFlags(d->inFlags, eatEscape_InputWidgetFlag, eatEscape);
-}
-
 static iRanges mark_InputWidget_(const iInputWidget *d) {
     iRanges m = { iMin(d->mark.start, d->mark.end), iMax(d->mark.start, d->mark.end) };
     const iInputLine *last = lastLine_InputWidget_(d);
@@ -1230,15 +1444,6 @@ static iRanges mark_InputWidget_(const iInputWidget *d) {
     return m;
 }
 
-static void contentsWereChanged_InputWidget_(iInputWidget *d) {
-    if (d->validator) {
-        d->validator(d, d->validatorContext); /* this may change the contents */
-    }
-    if (d->inFlags & notifyEdits_InputWidgetFlag) {
-        postCommand_Widget(d, "input.edited id:%s", cstr_String(id_Widget(constAs_Widget(d))));
-    }
-}
-
 static void deleteIndexRange_InputWidget_(iInputWidget *d, iRanges deleted) {
     size_t firstModified = iInvalidPos;
     restartBackupTimer_InputWidget_(d);
@@ -1364,7 +1569,7 @@ static iInt2 coordCursor_InputWidget_(const iInputWidget *d, iInt2 coord) {
 //        return cursorMax_InputWidget_(d);
 //    }
     iWrapText wrapText = {
-        .maxWidth = d->maxLen == 0 ? width_Rect(bounds) : unlimitedWidth_InputWidget_,
+        .maxWidth = d->maxLen == 0 ? iMaxi(minWidth_InputWidget_, width_Rect(bounds)) : unlimitedWidth_InputWidget_,
         .mode = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode : word_WrapTextMode),
         .hitPoint = relCoord,
         .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
@@ -1447,6 +1652,40 @@ static void extendRange_InputWidget_(iInputWidget *d, size_t *index, int dir) {
     *index = cursorToIndex_InputWidget_(d, pos);
 }
 
+static void lineTextWasChanged_InputWidget_(iInputWidget *d, iInputLine *line) {
+    const int y = indexOf_Array(&d->lines, line);
+    textOfLinesWasChanged_InputWidget_(d, (iRangei){ y, y + 1 });
+}
+#endif
+
+void setSensitiveContent_InputWidget(iInputWidget *d, iBool isSensitive) {
+    iChangeFlags(d->inFlags, isSensitive_InputWidgetFlag, isSensitive);
+}
+
+void setUrlContent_InputWidget(iInputWidget *d, iBool isUrl) {
+    iChangeFlags(d->inFlags, isUrl_InputWidgetFlag, isUrl);
+    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
+}
+
+void setSelectAllOnFocus_InputWidget(iInputWidget *d, iBool selectAllOnFocus) {
+    iChangeFlags(d->inFlags, selectAllOnFocus_InputWidgetFlag, selectAllOnFocus);
+}
+
+void setNotifyEdits_InputWidget(iInputWidget *d, iBool notifyEdits) {
+    iChangeFlags(d->inFlags, notifyEdits_InputWidgetFlag, notifyEdits);
+}
+
+void setEatEscape_InputWidget(iInputWidget *d, iBool eatEscape) {
+    iChangeFlags(d->inFlags, eatEscape_InputWidgetFlag, eatEscape);
+}
+
+static void contentsWereChanged_InputWidget_(iInputWidget *d) {
+    validate_InputWidget(d);
+    if (d->inFlags & notifyEdits_InputWidgetFlag) {
+        postCommand_Widget(d, "input.edited id:%s", cstr_String(id_Widget(constAs_Widget(d))));
+    }
+}
+
 static iRect bounds_InputWidget_(const iInputWidget *d) {
     const iWidget *w = constAs_Widget(d);
     iRect bounds = bounds_Widget(w);
@@ -1456,7 +1695,7 @@ static iRect bounds_InputWidget_(const iInputWidget *d) {
     /* There may be more visible lines than fits in the widget bounds. */
     bounds.size.y = contentHeight_InputWidget_(d) + 3 * padding_().y;
     if (w->flags & extraPadding_WidgetFlag) {
-        bounds.size.y += extraPaddingHeight_;
+        bounds.size.y += extraPaddingHeight_InputWidget_(d);
     }
     return bounds;
 }
@@ -1465,11 +1704,6 @@ static iBool contains_InputWidget_(const iInputWidget *d, iInt2 coord) {
     return contains_Rect(bounds_InputWidget_(d), coord);
 }
 
-static void lineTextWasChanged_InputWidget_(iInputWidget *d, iInputLine *line) {
-    const int y = indexOf_Array(&d->lines, line);
-    textOfLinesWasChanged_InputWidget_(d, (iRangei){ y, y + 1 });
-}
-
 static iBool isArrowUpDownConsumed_InputWidget_(const iInputWidget *d) {
     return d->maxWrapLines > 1;
 }
@@ -1494,6 +1728,7 @@ enum iEventResult {
     true_EventResult    = 2, /* event was processed and should not be passed on */
 };
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void markWordAtCursor_InputWidget_(iInputWidget *d) {
     d->mark.start = d->mark.end = cursorToIndex_InputWidget_(d, d->cursor);
     extendRange_InputWidget_(d, &d->mark.start, -1);
@@ -1510,8 +1745,10 @@ static void showClipMenu_(iInt2 coord) {
         openMenuFlags_Widget(clipMenu, coord, iFalse);
     }
 }
+#endif
 
 static enum iEventResult processPointerEvents_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     iWidget *w = as_Widget(d);
     if (ev->type == SDL_MOUSEMOTION && (isHover_Widget(d) || flags_Widget(w) & keepOnTop_WidgetFlag)) {
         const iInt2 coord = init_I2(ev->motion.x, ev->motion.y);
@@ -1585,9 +1822,11 @@ static enum iEventResult processPointerEvents_InputWidget_(iInputWidget *d, cons
             return true_EventResult;
         }
     }
+#endif
     return ignored_EventResult;
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static iInt2 touchCoordCursor_InputWidget_(const iInputWidget *d, iInt2 coord) {
     /* Clamp to the bounds so the cursor doesn't wrap at the ends. */
     iRect bounds = shrunk_Rect(contentBounds_InputWidget_(d), one_I2());
@@ -1609,9 +1848,11 @@ static int distanceToPos_InputWidget_(const iInputWidget *d, iInt2 uiCoord, iInt
     }
     return dist_I2(addY_I2(winCoord, lineHeight_Text(d->font) / 2), uiCoord);
 }
+#endif
 
 static enum iEventResult processTouchEvents_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     /*
      + first tap to focus & select all/place cursor
      + focused tap to place cursor
@@ -1853,9 +2094,22 @@ static enum iEventResult processTouchEvents_InputWidget_(iInputWidget *d, const
 //        /* Eat all mouse clicks on the widget. */
 //        return true_EventResult;
 //    }
+#else
+    /* Just a tap to activate the system-provided text input control. */
+    switch (processEvent_Click(&d->click, ev)) {
+        case none_ClickResult:
+            break;
+        case started_ClickResult:
+            setFocus_Widget(w);
+            return true_EventResult;
+        default:
+            return true_EventResult;
+    }
+#endif
     return ignored_EventResult;
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 static void clampWheelAccum_InputWidget_(iInputWidget *d, int wheel) {
     if (wheel > 0 && d->visWrapLines.start == 0) {
         d->wheelAccum = 0;
@@ -1866,12 +2120,41 @@ static void clampWheelAccum_InputWidget_(iInputWidget *d, int wheel) {
         refresh_Widget(d);
     }    
 }
+#endif
+
+static void overflowScrollToKeepVisible_InputWidget_(iAny *widget) {
+    iInputWidget *d = widget;
+    iWidget *w = as_Widget(d);
+    if (!isFocused_Widget(w) || isAffectedByVisualOffset_Widget(w)) {
+        return;
+    }
+    iRect rect    = boundsWithoutVisualOffset_Widget(w);
+    iRect visible = visibleRect_Root(w->root);
+    const uint32_t nowTime = SDL_GetTicks();
+    const double elapsed = (nowTime - d->lastOverflowScrollTime) / 1000.0;
+    int dist = bottom_Rect(rect) + gap_UI - bottom_Rect(visible);
+    const int step = iRound(10 * dist * elapsed);
+    if (step > 0) {
+        iWidget *scrollable = findOverflowScrollable_Widget(w);
+        if (scrollable) {
+            scrollOverflow_Widget(scrollable, -iClamp(step, 1, dist));
+            d->lastOverflowScrollTime = nowTime;
+        }
+    }
+    if (dist > 0) {
+        addTicker_App(overflowScrollToKeepVisible_InputWidget_, widget);
+    }
+}
 
 static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     /* Resize according to width immediately. */
     if (d->lastUpdateWidth != w->rect.size.x) {
         d->inFlags |= needUpdateBuffer_InputWidgetFlag;
+        if (contentBounds_InputWidget_(d).size.x < minWidth_InputWidget_) {
+            setFocus_Widget(NULL);
+            return iFalse;
+        }
         if (d->inFlags & isUrl_InputWidgetFlag) {
             /* Restore/omit the default scheme if necessary. */
             setText_InputWidget(d, text_InputWidget(d));
@@ -1879,15 +2162,24 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         updateAllLinesAndResizeHeight_InputWidget_(d);
         d->lastUpdateWidth = w->rect.size.x;
     }
-    if (isCommand_Widget(w, ev, "focus.gained")) {
-        begin_InputWidget(d);
+#if LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    if (isResize_UserEvent(ev)) {
+        if (d->sysCtrl) {
+            updateAfterVisualOffsetChange_InputWidget_(d, w->root);
+        }
+    }
+#endif
+    if (deviceType_App() != desktop_AppDeviceType && isCommand_UserEvent(ev, "menu.opened")) {
+        setFocus_Widget(NULL);
         return iFalse;
     }
-    else if (isEditing_InputWidget_(d) && (isCommand_UserEvent(ev, "window.focus.lost") ||
-                                           isCommand_UserEvent(ev, "window.focus.gained"))) {
-        startOrStopCursorTimer_InputWidget_(d, isCommand_UserEvent(ev, "window.focus.gained"));
-        d->cursorVis = 1;
-        refresh_Widget(d);
+    if (isCommand_Widget(w, ev, "focus.gained")) {
+        if (contentBounds_InputWidget_(d).size.x < minWidth_InputWidget_) {
+            setFocus_Widget(NULL);
+        }
+        else {
+            begin_InputWidget(d);
+        }
         return iFalse;
     }
     else if (isCommand_UserEvent(ev, "keyroot.changed")) {
@@ -1902,11 +2194,29 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         end_InputWidget(d, iTrue);
         return iFalse;
     }
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    else if (isCommand_UserEvent(ev, "prefs.blink.changed")) {
+        if (isEditing_InputWidget_(d) && arg_Command(command_UserEvent(ev))) {
+            startOrStopCursorTimer_InputWidget_(d, 2);
+        }
+        return iFalse;
+    }
+    else if (isEditing_InputWidget_(d) && (isCommand_UserEvent(ev, "window.focus.lost") ||
+                                           isCommand_UserEvent(ev, "window.focus.gained"))) {
+        startOrStopCursorTimer_InputWidget_(d, isCommand_UserEvent(ev, "window.focus.gained"));
+        d->cursorVis = 1;
+        refresh_Widget(d);
+        return iFalse;
+    }
     else if ((isCommand_UserEvent(ev, "copy") || isCommand_UserEvent(ev, "input.copy")) &&
              isEditing_InputWidget_(d)) {
         copy_InputWidget_(d, argLabel_Command(command_UserEvent(ev), "cut"));
         return iTrue;
     }
+//    else if (isFocused_Widget(d) && isCommand_UserEvent(ev, "copy")) {
+//        copy_InputWidget_(d, iFalse);
+//        return iTrue;
+//    }
     else if (isCommand_UserEvent(ev, "input.paste") && isEditing_InputWidget_(d)) {
         paste_InputWidget_(d);
         return iTrue;
@@ -1918,6 +2228,14 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return iTrue;
     }
+    else if (isCommand_UserEvent(ev, "text.insert")) {
+        pushUndo_InputWidget_(d);
+        deleteMarked_InputWidget_(d);
+        insertChar_InputWidget_(d, arg_Command(command_UserEvent(ev)));
+        contentsWereChanged_InputWidget_(d);
+        return iTrue;
+    }
+#endif
     else if (isCommand_UserEvent(ev, "input.selectall") && isEditing_InputWidget_(d)) {
         selectAll_InputWidget(d);
         return iTrue;
@@ -1928,24 +2246,19 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return iFalse;
     }
-    /* TODO: Scroll to keep widget visible when keyboard appears. */
-//    else if (isCommand_UserEvent(ev, "keyboard.changed")) {
-//        if (isFocused_Widget(d) && arg_Command(command_UserEvent(ev))) {
-//            iRect rect = bounds_Widget(w);
-//            rect.pos.y -= value_Anim(&get_Window()->rootOffset);
-//            const iInt2 visRoot = visibleSize_Root(w->root);
-//            if (bottom_Rect(rect) > visRoot.y) {
-//                setValue_Anim(&get_Window()->rootOffset, -(bottom_Rect(rect) - visRoot.y), 250);
-//            }
-//        }
-//        return iFalse;
-//    }
-    else if (isCommand_UserEvent(ev, "text.insert")) {
-        pushUndo_InputWidget_(d);
-        deleteMarked_InputWidget_(d);
-        insertChar_InputWidget_(d, arg_Command(command_UserEvent(ev)));
-        contentsWereChanged_InputWidget_(d);
-        return iTrue;
+    else if (isCommand_UserEvent(ev, "keyboard.changed")) {
+        const iBool isKeyboardVisible = (arg_Command(command_UserEvent(ev)) != 0);
+        /* Scroll to keep widget visible when keyboard appears. */
+        if (isFocused_Widget(d)) {
+            if (isKeyboardVisible) {
+                d->lastOverflowScrollTime = SDL_GetTicks();
+                overflowScrollToKeepVisible_InputWidget_(d);
+            }
+            else {
+                setFocus_Widget(NULL); /* stop editing */
+            }
+        }
+        return iFalse;
     }
     else if (isCommand_Widget(w, ev, "input.backup")) {
         if (d->inFlags & needBackup_InputWidgetFlag) {
@@ -1957,10 +2270,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         updateMetrics_InputWidget_(d);
      //   updateLinesAndResize_InputWidget_(d);
     }
-    else if (isFocused_Widget(d) && isCommand_UserEvent(ev, "copy")) {
-        copy_InputWidget_(d, iFalse);
-        return iTrue;
-    }
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     if (ev->type == SDL_MOUSEWHEEL && contains_Widget(w, coord_MouseWheelEvent(&ev->wheel))) {
         if (numWrapLines_InputWidget_(d) <= size_Range(&d->visWrapLines)) {
             return ignored_EventResult;
@@ -1994,6 +2304,17 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         }
         return false_EventResult;
     }
+    if (ev->type == SDL_TEXTINPUT && isFocused_Widget(w)) {
+        pushUndo_InputWidget_(d);
+        deleteMarked_InputWidget_(d);
+        insertRange_InputWidget_(d, range_CStr(ev->text.text));
+        contentsWereChanged_InputWidget_(d);
+        return iTrue;
+    }
+    const iInt2 curMax    = cursorMax_InputWidget_(d);
+    const iInt2 lineFirst = init_I2(0, d->cursor.y);
+    const iInt2 lineLast  = init_I2(endX_InputWidget_(d, d->cursor.y), d->cursor.y);
+#endif
     /* Click behavior depends on device type. */ {
         const int mbResult = (deviceType_App() == desktop_AppDeviceType
                               ? processPointerEvents_InputWidget_(d, ev)
@@ -2005,12 +2326,10 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     if (ev->type == SDL_KEYUP && isFocused_Widget(w)) {
         return iTrue;
     }
-    const iInt2 curMax    = cursorMax_InputWidget_(d);
-    const iInt2 lineFirst = init_I2(0, d->cursor.y);
-    const iInt2 lineLast  = init_I2(endX_InputWidget_(d, d->cursor.y), d->cursor.y);
     if (ev->type == SDL_KEYDOWN && isFocused_Widget(w)) {
         const int key  = ev->key.keysym.sym;
         const int mods = keyMods_Sym(ev->key.keysym.mod);
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
         if (mods == KMOD_PRIMARY) {
             switch (key) {
                 case 'c':
@@ -2028,7 +2347,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     return iTrue;
             }
         }
-#if defined (iPlatformApple)
+#  if defined (iPlatformApple)
         if (mods == KMOD_PRIMARY || mods == (KMOD_PRIMARY | KMOD_SHIFT)) {
             switch (key) {
                 case SDLK_UP:
@@ -2038,19 +2357,14 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     return iTrue;
             }
         }
-#endif
+#  endif
         d->prevCursor = d->cursor;
+#endif
         switch (key) {
-            case SDLK_INSERT:
-                if (mods == KMOD_SHIFT) {
-                    paste_InputWidget_(d);
-                }
-                return iTrue;
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
-                if (~d->inFlags & isSensitive_InputWidgetFlag &&
-                    ~d->inFlags & isUrl_InputWidgetFlag &&
-                    d->inFlags & lineBreaksEnabled_InputWidgetFlag && d->maxLen == 0) {
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+                if (isAllowedToInsertNewline_InputWidget_(d)) {
                     if (checkLineBreakMods_InputWidget_(d, mods)) {
                         pushUndo_InputWidget_(d);
                         deleteMarked_InputWidget_(d);
@@ -2059,6 +2373,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                         return iTrue;
                     }
                 }
+#endif
                 if (d->inFlags & enterKeyEnabled_InputWidgetFlag &&
                     (checkAcceptMods_InputWidget_(d, mods) ||
                      (~d->inFlags & lineBreaksEnabled_InputWidgetFlag))) {
@@ -2071,6 +2386,12 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 end_InputWidget(d, iTrue);
                 setFocus_Widget(NULL);
                 return (d->inFlags & eatEscape_InputWidgetFlag) != 0;
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+            case SDLK_INSERT:
+                if (mods == KMOD_SHIFT) {
+                    paste_InputWidget_(d);
+                }
+                return iTrue;
             case SDLK_BACKSPACE:
                 if (!isEmpty_Range(&d->mark)) {
                     pushUndo_InputWidget_(d);
@@ -2170,7 +2491,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     refresh_Widget(w);
                     return iTrue;
                 }
-#if defined (iPlatformApple)
+# if defined (iPlatformApple)
                 /* fall through for Emacs-style Home/End */
             case SDLK_e:
                 if (mods == KMOD_CTRL || mods == (KMOD_CTRL | KMOD_SHIFT)) {
@@ -2178,7 +2499,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     refresh_Widget(w);
                     return iTrue;
                 }
-#endif
+# endif
                 break;
             case SDLK_LEFT:
             case SDLK_RIGHT: {
@@ -2228,22 +2549,17 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 }
                 refresh_Widget(d);
                 return iTrue;
+#endif
         }
         if (mods & (KMOD_PRIMARY | KMOD_SECONDARY)) {
             return iFalse;
         }
         return iTrue;
     }
-    else if (ev->type == SDL_TEXTINPUT && isFocused_Widget(w)) {
-        pushUndo_InputWidget_(d);
-        deleteMarked_InputWidget_(d);
-        insertRange_InputWidget_(d, range_CStr(ev->text.text));
-        contentsWereChanged_InputWidget_(d);
-        return iTrue;
-    }
     return processEvent_Widget(w, ev);
 }
 
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
 iDeclareType(MarkPainter)
 
 struct Impl_MarkPainter {
@@ -2302,6 +2618,7 @@ static iBool draw_MarkPainter_(iWrapText *wrapText, iRangecc wrappedText, iTextA
     }
     return iTrue;
 }
+#endif
 
 static void draw_InputWidget_(const iInputWidget *d) {
     const iWidget *w         = constAs_Widget(d);
@@ -2324,13 +2641,22 @@ static void draw_InputWidget_(const iInputWidget *d) {
                             isFocused ? gap_UI / 4 : 1,
                             isFocused ? uiInputFrameFocused_ColorId
                                       : isHover ? uiInputFrameHover_ColorId : uiInputFrame_ColorId);
-    setClip_Paint(&p, adjusted_Rect(bounds, init_I2(d->leftPadding, 0),
-                                    init_I2(-d->rightPadding, w->flags & extraPadding_WidgetFlag ? -gap_UI / 2 : 0)));
+    if (d->sysCtrl) {
+        /* The system-provided control is drawing the text. */
+        drawChildren_Widget(w);
+        return;
+    }
     const iRect contentBounds = contentBounds_InputWidget_(d);
-    iInt2       drawPos    = topLeft_Rect(contentBounds);
-    const int   fg         = isHint                                   ? uiAnnotation_ColorId
-                             : isFocused /*&& !isEmpty_Array(&d->lines)*/ ? uiInputTextFocused_ColorId
-                                                                      : uiInputText_ColorId;
+    iInt2       drawPos       = topLeft_Rect(contentBounds);
+    const int   fg            = isHint      ? uiAnnotation_ColorId
+                                : isFocused ? uiInputTextFocused_ColorId
+                                            : uiInputText_ColorId;
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
+    setClip_Paint(&p,
+                  adjusted_Rect(bounds,
+                                init_I2(d->leftPadding, 0),
+                                init_I2(-d->rightPadding,
+                                        w->flags & extraPadding_WidgetFlag ? -gap_UI / 2 : 0)));
     iWrapText wrapText = {
         .maxWidth     = d->maxLen == 0 ? width_Rect(contentBounds) : unlimitedWidth_InputWidget_,
         .mode         = (d->inFlags & isUrl_InputWidgetFlag ? anyCharacter_WrapTextMode
@@ -2338,16 +2664,37 @@ static void draw_InputWidget_(const iInputWidget *d) {
         .overrideChar = (d->inFlags & isSensitive_InputWidgetFlag ? sensitiveChar_ : 0),
     };
     const iRangei visLines       = visibleLineRange_InputWidget_(d);
-    const int     visLineOffsetY = visLineOffsetY_InputWidget_(d);
     iRect         markerRects[2] = { zero_Rect(), zero_Rect() };
+#endif
+    const int     visLineOffsetY = visLineOffsetY_InputWidget_(d);
     /* If buffered, just draw the buffered copy. */
     if (d->buffered && !isFocused) {
         /* Most input widgets will use this, since only one is focused at a time. */
-        draw_TextBuf(d->buffered, addY_I2(drawPos, visLineOffsetY), white_ColorId);
+        if (flags_Widget(w) & alignRight_WidgetFlag) {
+            draw_TextBuf(
+                d->buffered,
+                addY_I2(init_I2(right_Rect(contentBounds) - d->buffered->size.x, drawPos.y),
+                        visLineOffsetY),
+                white_ColorId);
+        }
+        else {        
+            draw_TextBuf(d->buffered, addY_I2(drawPos, visLineOffsetY), white_ColorId);
+        }
     }
     else if (isHint) {
-        drawRange_Text(d->font, drawPos, uiAnnotation_ColorId, range_String(&d->hint));
+        if (flags_Widget(w) & alignRight_WidgetFlag) {
+            drawAlign_Text(d->font,
+                           init_I2(right_Rect(contentBounds), drawPos.y),
+                           uiAnnotation_ColorId,
+                           right_Alignment,
+                           "%s",
+                           cstr_String(&d->hint));
+        }
+        else {
+            drawRange_Text(d->font, drawPos, uiAnnotation_ColorId, range_String(&d->hint));
+        }
     }
+#if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
     else {
         iAssert(~d->inFlags & isSensitive_InputWidgetFlag || size_Range(&visLines) == 1);
         drawPos.y += visLineOffsetY;
@@ -2372,7 +2719,8 @@ static void draw_InputWidget_(const iInputWidget *d) {
         wrapText.context  = NULL;
     }
     /* Draw the insertion point. */
-    if (isFocused && d->cursorVis && contains_Range(&visLines, d->cursor.y) &&
+    if (isFocused && (d->cursorVis || !prefs_App()->blinkingCursor) &&
+        contains_Range(&visLines, d->cursor.y) &&
         (deviceType_App() == desktop_AppDeviceType || isEmpty_Range(&d->mark))) {
         iInt2    curSize;
         iRangecc cursorChar    = iNullRange;
@@ -2426,6 +2774,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
             drawPin_Paint(&p, markerRects[i], i, uiTextCaution_ColorId);
         }
     }
+#endif
     drawChildren_Widget(w);
 }
 
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index f70c81af..5a61ec22 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -57,6 +57,7 @@ void    setBackupFileName_InputWidget   (iInputWidget *, const char *fileName);
 void    begin_InputWidget               (iInputWidget *);
 void    end_InputWidget                 (iInputWidget *, iBool accept);
 void    selectAll_InputWidget           (iInputWidget *);
+void    validate_InputWidget            (iInputWidget *);
 
 void    setSelectAllOnFocus_InputWidget (iInputWidget *, iBool selectAllOnFocus);
 void    setSensitiveContent_InputWidget (iInputWidget *, iBool isSensitive);
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 30072572..d4d9320e 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -240,6 +240,7 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 100,{ "${keys.hoverurl}",             '/', KMOD_PRIMARY,              "prefs.hoverlink.toggle"            }, 0 },
     { 110,{ "${menu.save.downloads}",       SDLK_s, KMOD_PRIMARY,           "document.save"                     }, 0 },
     { 120,{ "${keys.upload}",               SDLK_u, KMOD_PRIMARY,           "document.upload"                   }, 0 },
+    { 121,{ "${keys.upload.edit}",          SDLK_e, KMOD_PRIMARY,           "document.upload copy:1"            }, 0 },
     /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
     { 1002, { NULL, SDLK_LEFTBRACKET,  KMOD_PRIMARY,             "navigate.back"        }, 0 },
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 4dd66a28..3454014a 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -36,6 +36,7 @@ struct Impl_LabelWidget {
     iWidget widget;
     iString srcLabel;
     iString label;
+    iInt2   labelOffset;
     int     font;
     int     key;
     int     kmods;
@@ -44,14 +45,15 @@ struct Impl_LabelWidget {
     iString command;
     iClick  click;
     struct {
-        uint8_t alignVisual         : 1; /* align according to visible bounds, not font metrics */
-        uint8_t noAutoMinHeight     : 1; /* minimum height is not set automatically */
-        uint8_t drawAsOutline       : 1; /* draw as outline, filled with background color */
-        uint8_t noTopFrame          : 1;
-        uint8_t wrap                : 1;
-        uint8_t allCaps             : 1;
-        uint8_t removeTrailingColon : 1;
-        uint8_t chevron             : 1;
+        uint16_t alignVisual         : 1; /* align according to visible bounds, not font metrics */
+        uint16_t noAutoMinHeight     : 1; /* minimum height is not set automatically */
+        uint16_t drawAsOutline       : 1; /* draw as outline, filled with background color */
+        uint16_t noTopFrame          : 1;
+        uint16_t wrap                : 1;
+        uint16_t allCaps             : 1;
+        uint16_t removeTrailingColon : 1;
+        uint16_t chevron             : 1;        
+        uint16_t checkMark           : 1;
     } flags;
 };
 
@@ -132,6 +134,10 @@ static iBool processEvent_LabelWidget_(iLabelWidget *d, const SDL_Event *ev) {
         refresh_Widget(d);
         return iFalse;
     }
+    else if (isCommand_Widget(w, ev, "trigger")) {
+        trigger_LabelWidget_(d);
+        return iTrue;
+    }
     if (!isEmpty_String(&d->command)) {
 #if 0 && defined (iPlatformAppleMobile)
         /* Touch allows activating any button on release. */
@@ -193,6 +199,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
                                    int *icon, int *meta) {
     const iWidget *w           = constAs_Widget(d);
     const int64_t  flags       = flags_Widget(w);
+    const iBool    isHover     = isHover_LabelWidget_(d);
     const iBool    isFocus     = (flags & focusable_WidgetFlag && isFocused_Widget(d));
     const iBool    isPress     = (flags & pressed_WidgetFlag) != 0;
     const iBool    isSel       = (flags & selected_WidgetFlag) != 0;
@@ -205,6 +212,9 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
     *bg     = isButton && ~flags & noBackground_WidgetFlag ? (d->widget.bgColor != none_ColorId ?
                                                               d->widget.bgColor : uiBackground_ColorId)
                                                            : none_ColorId;
+    if (d->flags.checkMark) {
+        *bg = none_ColorId;
+    }
     *fg     = uiText_ColorId;
     *frame1 = isButton ? uiEmboss1_ColorId : d->widget.frameColor;
     *frame2 = isButton ? uiEmboss2_ColorId : *frame1;
@@ -216,18 +226,17 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         *meta = uiTextDisabled_ColorId;
     }
     if (isSel) {
-        if (isMenuItem) {
-            *bg = uiBackgroundUnfocusedSelection_ColorId;
-        }
-        else {
-            *bg = uiBackgroundSelected_ColorId;            
-        }
-//        if (!isKeyRoot) {
-//            *bg = uiEmbossSelected1_ColorId; //uiBackgroundUnfocusedSelection_ColorId;
-//        }
-        if (!isKeyRoot) {
-            *bg = isDark_ColorTheme(colorTheme_App()) ? uiBackgroundUnfocusedSelection_ColorId
-                : uiMarked_ColorId ;
+        if (!d->flags.checkMark) {
+            if (isMenuItem) {
+                *bg = uiBackgroundUnfocusedSelection_ColorId;
+            }
+            else {
+                *bg = uiBackgroundSelected_ColorId;
+            }
+            if (!isKeyRoot) {
+                *bg = isDark_ColorTheme(colorTheme_App()) ? uiBackgroundUnfocusedSelection_ColorId
+                                                          : uiMarked_ColorId;
+            }
         }
         *fg = uiTextSelected_ColorId;
         if (isButton) {
@@ -248,7 +257,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
     if (colorEscape == uiTextCaution_ColorId) {
         *icon = *meta = colorEscape;
     }
-    if (isHover_LabelWidget_(d)) {
+    if (isHover) {
         if (isFrameless) {
             *bg = uiBackgroundFramelessHover_ColorId;
             *fg = uiTextFramelessHover_ColorId;
@@ -274,7 +283,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         }
     }
     if (d->forceFg >= 0) {
-        *fg = /* *icon = */ *meta = d->forceFg;
+        *fg = *meta = d->forceFg;
     }
     if (isPress) {
         if (colorEscape == uiTextAction_ColorId || colorEscape == uiTextCaution_ColorId) {
@@ -289,13 +298,12 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
                 *frame1 = uiEmbossPressed1_ColorId;
                 *frame2 = colorEscape != none_ColorId ? colorEscape : uiEmbossPressed2_ColorId;
             }
-            //if (colorEscape == none_ColorId || colorEscape == uiTextAction_ColorId) {
             *fg = *icon = *meta = uiTextPressed_ColorId | permanent_ColorId;
-    //        }
-    //        else {
-    //            *fg = (isDark_ColorTheme(colorTheme_App()) ? white_ColorId : black_ColorId) | permanent_ColorId;
-    //        }
         }
+        }
+    if (((isSel || isHover) && isFrameless) || isPress) {
+        /* Ensure that the full label text remains readable. */
+        *fg |= permanent_ColorId;
     }
 }
 
@@ -328,6 +336,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     init_Paint(&p);
     int bg, fg, frame, frame2, iconColor, metaColor;
     getColors_LabelWidget_(d, &bg, &fg, &frame, &frame2, &iconColor, &metaColor);
+    setBaseAttributes_Text(d->font, fg);
     const enum iColorId colorEscape = parseEscape_Color(cstr_String(&d->label), NULL);
     const iBool isCaution = (colorEscape == uiTextCaution_ColorId);
     if (bg >= 0) {
@@ -347,7 +356,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
                 bottomRight_Rect(frameRect),
                 bottomLeft_Rect(frameRect)
             };
-#if SDL_VERSION_ATLEAST(2, 0, 16)
+#if SDL_COMPILEDVERSION == SDL_VERSIONNUM(2, 0, 16)
             if (isOpenGLRenderer_Window()) {
                 /* A very curious regression in SDL 2.0.16. */
                 points[3].x--;    
@@ -362,10 +371,6 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     }
     setClip_Paint(&p, rect);
     const int iconPad = iconPadding_LabelWidget_(d);
-//    const int iconColor = isCaution ? uiTextCaution_ColorId
-//                          : flags & (disabled_WidgetFlag | pressed_WidgetFlag) ? fg
-//                          : isHover                                            ? uiIconHover_ColorId
-//                                                                               : uiIcon_ColorId;
     if (d->icon && d->icon != 0x20) { /* no need to draw an empty icon */
         iString str;
         initUnicodeN_String(&str, &d->icon, 1);
@@ -427,22 +432,35 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     else {
         drawCenteredOutline_Text(
             d->font,
-            adjusted_Rect(bounds, init_I2(iconPad * (flags & tight_WidgetFlag ? 1.0f : 1.5f), 0),
+            moved_Rect(
+                adjusted_Rect(bounds,
+                              init_I2(iconPad * (flags & tight_WidgetFlag ? 1.0f : 1.5f), 0),
                           init_I2(-iconPad * (flags & tight_WidgetFlag ? 0.5f : 1.0f), 0)),
+                d->labelOffset),
             d->flags.alignVisual,
             d->flags.drawAsOutline ? fg : none_ColorId,
             d->flags.drawAsOutline ? d->widget.bgColor : fg,
             "%s",
             cstr_String(&d->label));
     }
-    if (d->flags.chevron) {
+    if (d->flags.chevron || (flags & selected_WidgetFlag && d->flags.checkMark)) {
         const iRect chRect = rect;
         const int chSize = lineHeight_Text(d->font);
+        int offset = 0;
+        if (d->flags.chevron) {
+            offset = -iconPad;
+        }
+        else {
+            offset = -10 * gap_UI;
+        }
         drawCentered_Text(d->font,
-                          (iRect){ addX_I2(topRight_Rect(chRect), -iconPad),
+                          (iRect){ addX_I2(topRight_Rect(chRect), offset),
                                    init_I2(chSize, height_Rect(chRect)) },
-                          iTrue, iconColor, rightAngle_Icon);
+                          iTrue,
+                          iconColor,
+                          d->flags.chevron ? rightAngle_Icon : check_Icon);
     }
+    setBaseAttributes_Text(-1, -1);
     unsetClip_Paint(&p);
     drawChildren_Widget(w);
 }
@@ -482,9 +500,10 @@ int font_LabelWidget(const iLabelWidget *d) {
 }
 
 void updateSize_LabelWidget(iLabelWidget *d) {
-    iWidget *w = as_Widget(d);
+    if (!d) return;
+    iWidget      *w     = as_Widget(d);
     const int64_t flags = flags_Widget(w);
-    const iInt2 size = defaultSize_LabelWidget(d);
+    const iInt2   size  = defaultSize_LabelWidget(d);
     if (!d->flags.noAutoMinHeight) {
         w->minSize.y = size.y; /* vertically text must remain visible */
     }
@@ -514,6 +533,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     d->font = uiLabel_FontId;
     d->forceFg = none_ColorId;
     d->icon = 0;
+    d->labelOffset = zero_I2();
     initCStr_String(&d->srcLabel, label);
     initCopy_String(&d->label, &d->srcLabel);
     replaceVariables_LabelWidget_(d);
@@ -551,18 +571,22 @@ void setTextColor_LabelWidget(iLabelWidget *d, int color) {
 }
 
 void setText_LabelWidget(iLabelWidget *d, const iString *text) {
+    if (d) {
     updateText_LabelWidget(d, text);
     updateSize_LabelWidget(d);
     if (isWrapped_LabelWidget(d)) {
         sizeChanged_LabelWidget_(d);
+}
     }
 }
 
 void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
+    if (d) {
     updateTextCStr_LabelWidget(d, text);
     updateSize_LabelWidget(d);
     if (isWrapped_LabelWidget(d)) {
         sizeChanged_LabelWidget_(d);
+        }
     }
 }
 
@@ -586,6 +610,10 @@ void setChevron_LabelWidget(iLabelWidget *d, iBool chevron) {
     d->flags.chevron = chevron;
 }
 
+void setCheckMark_LabelWidget(iLabelWidget *d, iBool checkMark) {
+    d->flags.checkMark = checkMark;
+}
+
 void setWrap_LabelWidget(iLabelWidget *d, iBool wrap) {
     d->flags.wrap = wrap;
 }
@@ -610,6 +638,10 @@ void setRemoveTrailingColon_LabelWidget(iLabelWidget *d, iBool removeTrailingCol
     }
 }
 
+void setTextOffset_LabelWidget(iLabelWidget *d, iInt2 offset) {
+    d->labelOffset = offset;
+}
+
 void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
     set_String(&d->label, text);
     set_String(&d->srcLabel, text);
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 6542ae12..4f605d6b 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -33,10 +33,12 @@ void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 void    setNoAutoMinHeight_LabelWidget  (iLabelWidget *, iBool noAutoMinHeight);
 void    setNoTopFrame_LabelWidget   (iLabelWidget *, iBool noTopFrame);
 void    setChevron_LabelWidget      (iLabelWidget *, iBool chevron);
+void    setCheckMark_LabelWidget    (iLabelWidget *, iBool checkMark);
 void    setWrap_LabelWidget         (iLabelWidget *, iBool wrap);
 void    setOutline_LabelWidget      (iLabelWidget *, iBool drawAsOutline);
 void    setAllCaps_LabelWidget      (iLabelWidget *, iBool allCaps);
 void    setRemoveTrailingColon_LabelWidget  (iLabelWidget *, iBool removeTrailingColon);
+void    setTextOffset_LabelWidget   (iLabelWidget *, iInt2 offset);
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
 void    setTextColor_LabelWidget    (iLabelWidget *, int color);
 void    setText_LabelWidget         (iLabelWidget *, const iString *text); /* resizes widget */
diff --git a/src/ui/linkinfo.c b/src/ui/linkinfo.c
new file mode 100644
index 00000000..5102f9b3
--- /dev/null
+++ b/src/ui/linkinfo.c
@@ -0,0 +1,176 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "linkinfo.h"
+#include "metrics.h"
+#include "paint.h"
+#include "../gmcerts.h"
+#include "../app.h"
+
+#include <SDL_render.h>
+
+iDefineTypeConstruction(LinkInfo)
+
+#define minWidth_LinkInfo_  (40 * gap_UI)
+#define hPad_LinkInfo_      (2 * gap_UI)
+#define vPad_LinkInfo_      (1 * gap_UI)
+
+void init_LinkInfo(iLinkInfo *d) {
+    d->buf = NULL;
+    init_Anim(&d->opacity, 0.0f);
+    d->isAltPos = iFalse;
+}
+
+void deinit_LinkInfo(iLinkInfo *d) {
+    delete_TextBuf(d->buf);
+}
+
+iInt2 size_LinkInfo(const iLinkInfo *d) {
+    if (!d->buf) {
+        return zero_I2();
+    }
+    return add_I2(d->buf->size, init_I2(2 * hPad_LinkInfo_, 2 * vPad_LinkInfo_));
+}
+
+void infoText_LinkInfo(const iGmDocument *doc, iGmLinkId linkId, iString *text_out) {
+    const iString *url = linkUrl_GmDocument(doc, linkId);
+    iUrl parts;
+    init_Url(&parts, url);
+    const int                flags   = linkFlags_GmDocument(doc, linkId);
+    const enum iGmLinkScheme scheme  = scheme_GmLinkFlag(flags);
+    const iBool              isImage = (flags & imageFileExtension_GmLinkFlag) != 0;
+    const iBool              isAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
+    /* Most important info first: the identity that will be used. */
+    const iGmIdentity *ident = identityForUrl_GmCerts(certs_App(), url);
+    if (ident) {
+        appendFormat_String(text_out, person_Icon " %s",
+                                                     //escape_Color(tmBannerItemTitle_ColorId),
+                            cstr_String(name_GmIdentity(ident)));
+    }
+    /* Possibly inlined content. */
+    if (isImage || isAudio) {
+        if (!isEmpty_String(text_out)) {
+            appendCStr_String(text_out, "\n");
+        }
+        appendCStr_String(
+                          text_out,
+            format_CStr(isImage ? photo_Icon " %s " : "\U0001f3b5 %s",
+                        cstr_Lang(isImage ? "link.hint.image" : "link.hint.audio")));
+    }
+    if (!isEmpty_String(text_out)) {
+        appendCStr_String(text_out, " \u2014 ");
+    }
+    /* Indicate non-Gemini schemes. */
+    if (scheme == mailto_GmLinkScheme) {
+        appendCStr_String(text_out, envelope_Icon " ");
+        append_String(text_out, url);
+    }
+    else if (scheme != gemini_GmLinkScheme && !isEmpty_Range(&parts.host)) {
+        appendCStr_String(text_out, globe_Icon " \x1b[1m");
+        appendRange_String(text_out, (iRangecc){ constBegin_String(url),
+                                             parts.host.end });
+        appendCStr_String(text_out, "\x1b[0m");
+        appendRange_String(text_out, (iRangecc){ parts.path.start, constEnd_String(url) });
+    }
+    else if (scheme != gemini_GmLinkScheme) {
+        appendCStr_String(text_out, scheme == file_GmLinkScheme ? "" : globe_Icon " ");
+        append_String(text_out, url);
+    }
+    else {
+        appendCStr_String(text_out, "\x1b[1m");
+        appendRange_String(text_out, parts.host);
+        if (!isEmpty_Range(&parts.port)) {
+            appendCStr_String(text_out, ":");
+            appendRange_String(text_out, parts.port);
+        }
+        appendCStr_String(text_out, "\x1b[0m");
+        appendRange_String(text_out, (iRangecc){ parts.path.start, constEnd_String(url) });
+    }
+    /* Date of last visit. */
+    if (flags & visited_GmLinkFlag) {
+        iDate date;
+        init_Date(&date, linkTime_GmDocument(doc, linkId));
+        if (!isEmpty_String(text_out)) {
+            appendCStr_String(text_out, " \u2014 ");
+        }
+        iString *dateStr = format_Date(&date, "%b %d");
+        append_String(text_out, dateStr);
+        delete_String(dateStr);
+    }
+}
+
+iBool update_LinkInfo(iLinkInfo *d, const iGmDocument *doc, iGmLinkId linkId, int maxWidth) {    
+    if (!d) {
+        return iFalse;
+    }
+    const iBool isAnimated = prefs_App()->uiAnimations;
+    if (d->linkId != linkId || d->maxWidth != maxWidth) {
+        d->linkId   = linkId;
+        d->maxWidth = maxWidth;
+        invalidate_LinkInfo(d);
+        if (linkId) {
+            iString str;
+            init_String(&str);
+            infoText_LinkInfo(doc, linkId, &str);
+            if (targetValue_Anim(&d->opacity) < 1) {
+                setValue_Anim(&d->opacity, 1, isAnimated ? 75 : 0);
+            }
+            /* Draw to a buffer, wrapped. */
+            const int avail = iMax(minWidth_LinkInfo_, maxWidth) - 2 * hPad_LinkInfo_;
+            iWrapText wt = { .text = range_String(&str), .maxWidth = avail, .mode = word_WrapTextMode };
+            d->buf = new_TextBuf(&wt, uiLabel_FontId, tmQuote_ColorId);
+            deinit_String(&str);
+        }
+        else {
+            if (targetValue_Anim(&d->opacity) > 0) {
+                setValue_Anim(&d->opacity, 0, isAnimated ? 150 : 0);
+            }            
+        }
+        return iTrue;
+    }
+    return iFalse;
+}
+
+void invalidate_LinkInfo(iLinkInfo *d) {
+    if (targetValue_Anim(&d->opacity) > 0) {
+        setValue_Anim(&d->opacity, 0, prefs_App()->uiAnimations ? 150 : 0);
+    }            
+}
+
+void draw_LinkInfo(const iLinkInfo *d, iInt2 topLeft) {
+    const float opacity = value_Anim(&d->opacity);
+    if (!d->buf || opacity <= 0.01f) {
+        return;
+    }
+    iPaint p;
+    init_Paint(&p);
+    iInt2 size = size_LinkInfo(d);
+    iRect rect = { topLeft, size };
+    SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
+    p.alpha = 255 * opacity;
+    fillRect_Paint(&p, rect, tmBackgroundAltText_ColorId);
+    drawRect_Paint(&p, rect, tmFrameAltText_ColorId);
+    SDL_SetTextureAlphaMod(d->buf->texture, p.alpha);
+    draw_TextBuf(d->buf, add_I2(topLeft, init_I2(hPad_LinkInfo_, vPad_LinkInfo_)),
+                 white_ColorId);
+    SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
+}
diff --git a/src/ui/linkinfo.h b/src/ui/linkinfo.h
new file mode 100644
index 00000000..38b90b87
--- /dev/null
+++ b/src/ui/linkinfo.h
@@ -0,0 +1,47 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+ 
+#pragma once
+
+#include "text.h"
+#include "util.h"
+#include "../gmdocument.h"
+
+iDeclareType(LinkInfo)
+iDeclareTypeConstruction(LinkInfo)
+    
+struct Impl_LinkInfo {
+    iGmLinkId linkId;
+    int       maxWidth;
+    iTextBuf *buf;
+    iAnim     opacity;
+    iBool     isAltPos;
+};
+
+iBool   update_LinkInfo     (iLinkInfo *, const iGmDocument *doc, iGmLinkId linkId,
+                             int maxWidth); /* returns true if changed */
+void    invalidate_LinkInfo (iLinkInfo *);
+
+void    infoText_LinkInfo   (const iGmDocument *doc, iGmLinkId linkId, iString *text_out);
+
+iInt2   size_LinkInfo       (const iLinkInfo *);
+void    draw_LinkInfo       (const iLinkInfo *, iInt2 topLeft);
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index c2ba5581..1d0f1729 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -49,21 +49,6 @@ iDefineClass(ListItem)
 
 iDefineObjectConstruction(ListWidget)
 
-struct Impl_ListWidget {
-    iWidget widget;
-    iScrollWidget *scroll;
-    iSmoothScroll scrollY;
-    int itemHeight;
-    iPtrArray items;
-    size_t hoverItem;
-    size_t dragItem;
-    iInt2 dragOrigin; /* offset from mouse to drag item's top-left corner */
-    iClick click;
-    iIntSet invalidItems;
-    iVisBuf *visBuf;
-    iBool noHoverWhileScrolling;
-};
-
 static void refreshWhileScrolling_ListWidget_(iAnyObject *any) {
     iListWidget *d = any;
     updateVisible_ListWidget(d);
@@ -96,11 +81,13 @@ void init_ListWidget(iListWidget *d) {
     setThumb_ScrollWidget(d->scroll, 0, 0);
     init_SmoothScroll(&d->scrollY, w, scrollBegan_ListWidget_);
     d->itemHeight = 0;
+    d->scrollMode = normal_ScrollMode;
     d->noHoverWhileScrolling = iFalse;
     init_PtrArray(&d->items);
     d->hoverItem = iInvalidPos;
     d->dragItem = iInvalidPos;
     d->dragOrigin = zero_I2();
+    d->dragHandleWidth = 0;
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     init_IntSet(&d->invalidItems);
     d->visBuf = new_VisBuf();
@@ -202,6 +189,17 @@ void setScrollPos_ListWidget(iListWidget *d, int pos) {
     refresh_Widget(as_Widget(d));
 }
 
+void setScrollMode_ListWidget(iListWidget *d, enum iScrollMode mode) {
+    d->scrollMode = mode;
+}
+
+void setDragHandleWidth_ListWidget(iListWidget *d, int dragHandleWidth) {
+    d->dragHandleWidth = dragHandleWidth;
+    if (dragHandleWidth == 0) {
+        setFlags_Widget(as_Widget(d), touchDrag_WidgetFlag, iFalse); /* mobile drag handles */
+    }
+}
+
 void scrollOffset_ListWidget(iListWidget *d, int offset) {
     moveSpan_SmoothScroll(&d->scrollY, offset, 0);
 }
@@ -363,6 +361,7 @@ static iBool endDrag_ListWidget_(iListWidget *d, iInt2 endPos) {
     if (d->dragItem == iInvalidPos) {
         return iFalse;
     }
+    setFlags_Widget(as_Widget(d), touchDrag_WidgetFlag, iFalse); /* mobile drag handles */
     stop_Anim(&d->scrollY.pos);
     enum iDragDestination dstKind;
     const size_t index = resolveDragDestination_ListWidget_(d, endPos, &dstKind);
@@ -381,12 +380,31 @@ static iBool endDrag_ListWidget_(iListWidget *d, iInt2 endPos) {
     return iTrue;
 }
 
+static iBool isScrollDisabled_ListWidget_(const iListWidget *d, const SDL_Event *ev) {
+    int dir = 0;
+    if (ev->type == SDL_MOUSEWHEEL) {
+        dir = iSign(ev->wheel.y);
+    }
+    switch (d->scrollMode) {
+        case disabled_ScrollMode:
+            return iTrue;
+        case disabledAtTopBothDirections_ScrollMode:
+            return scrollPos_ListWidget(d) <= 0;
+        case disabledAtTopUpwards_ScrollMode:
+            return scrollPos_ListWidget(d) <= 0 && dir > 0;
+        default:
+            break;
+    }
+    return iFalse;
+}
+
 static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isMetricsChange_UserEvent(ev)) {
         invalidate_ListWidget(d);
     }
-    else if (processEvent_SmoothScroll(&d->scrollY, ev)) {
+    else if (!isScrollDisabled_ListWidget_(d, ev) &&
+             processEvent_SmoothScroll(&d->scrollY, ev)) {
         return iTrue;
     }
     else if (isCommand_SDLEvent(ev)) {
@@ -435,6 +453,29 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
         }
     }
     if (ev->type == SDL_MOUSEWHEEL && isHover_Widget(w)) {
+        if (d->dragHandleWidth) {
+            if (d->dragItem == iInvalidPos) {
+                const iInt2 wpos = coord_MouseWheelEvent(&ev->wheel);
+                if (contains_Widget(w, wpos) &&
+                    wpos.x >= right_Rect(boundsWithoutVisualOffset_Widget(w)) - d->dragHandleWidth) {
+                    setFlags_Widget(w, touchDrag_WidgetFlag, iTrue);
+                    printf("[%p] touch drag started\n", d);
+                    return iTrue;
+                }
+            }
+        }
+        if (isScrollDisabled_ListWidget_(d, ev)) {
+            if (ev->wheel.which == SDL_TOUCH_MOUSEID) {
+                /* TODO: Could generalize this selection of the scrollable parent. */
+                extern iWidgetClass Class_SidebarWidget;
+                iWidget *sidebar = findParentClass_Widget(w, &Class_SidebarWidget);
+                if (sidebar) {
+                    transferAffinity_Touch(w, sidebar);
+                    d->noHoverWhileScrolling = iTrue;
+                }
+            }
+            return iFalse;
+        }
         int amount = -ev->wheel.y;
         if (isPerPixel_MouseWheelEvent(&ev->wheel)) {
             stop_Anim(&d->scrollY.pos);
@@ -480,7 +521,9 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
                 return iTrue;
             }
             redrawHoverItem_ListWidget_(d);
-            if (contains_Rect(itemRect_ListWidget(d, d->hoverItem), pos_Click(&d->click)) &&
+            if (contains_Rect(adjusted_Rect(itemRect_ListWidget(d, d->hoverItem),
+                                            zero_I2(), init_I2(-d->dragHandleWidth, 0)),
+                              pos_Click(&d->click)) &&
                 d->hoverItem != iInvalidPos) {
                 postCommand_Widget(w, "list.clicked arg:%zu item:%p",
                                    d->hoverItem, constHoverItem_ListWidget(d));
@@ -580,8 +623,9 @@ static void draw_ListWidget_(const iListWidget *d) {
     }
     setClip_Paint(&p, bounds_Widget(w));
     draw_VisBuf(d->visBuf, addY_I2(topLeft_Rect(bounds), -scrollY), ySpan_Rect(bounds));
-    const iInt2 mousePos = mouseCoord_Window(get_Window(), 0);
-    if (d->dragItem != iInvalidPos && contains_Rect(bounds, mousePos)) {
+    const iBool isMobile = (deviceType_App() != desktop_AppDeviceType);
+    const iInt2 mousePos = mouseCoord_Window(get_Window(), isMobile ? SDL_TOUCH_MOUSEID : 0);
+    if (d->dragItem != iInvalidPos && (isMobile || contains_Rect(bounds, mousePos))) {
         iInt2 pos = add_I2(mousePos, d->dragOrigin);
         const iListItem *item = constAt_PtrArray(&d->items, d->dragItem);
         const iRect itemRect = { init_I2(left_Rect(bounds), pos.y),
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index 8adf6ac3..da215b19 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "scrollwidget.h"
 #include "paint.h"
 
+#include <the_Foundation/intset.h>
 #include <the_Foundation/ptrarray.h>
 
 iDeclareType(ListWidget)
@@ -48,6 +49,34 @@ iDeclareObjectConstruction(ListItem)
 iDeclareWidgetClass(ListWidget)
 iDeclareObjectConstruction(ListWidget)
 
+iDeclareType(VisBuf)
+
+enum iScrollMode {
+    normal_ScrollMode,
+    disabledAtTopBothDirections_ScrollMode,
+    disabledAtTopUpwards_ScrollMode,
+    disabled_ScrollMode,
+};
+
+struct Impl_ListWidget {
+    iWidget        widget;
+    iScrollWidget *scroll;
+    iSmoothScroll  scrollY;
+    int            itemHeight;
+    iPtrArray      items;
+    size_t         hoverItem;
+    size_t         dragItem;
+    iInt2          dragOrigin; /* offset from mouse to drag item's top-left corner */
+    int            dragHandleWidth;
+    iClick         click;
+    iIntSet        invalidItems;
+    iVisBuf       *visBuf;
+    enum iScrollMode scrollMode;
+    iBool          noHoverWhileScrolling;
+};
+
+void    init_ListWidget             (iListWidget *);
+
 void    setItemHeight_ListWidget    (iListWidget *, int itemHeight);
 
 void    invalidate_ListWidget       (iListWidget *);
@@ -62,6 +91,8 @@ int     itemHeight_ListWidget       (const iListWidget *);
 int     scrollPos_ListWidget        (const iListWidget *);
 
 void    setScrollPos_ListWidget     (iListWidget *, int pos);
+void    setScrollMode_ListWidget    (iListWidget *, enum iScrollMode mode);
+void    setDragHandleWidth_ListWidget(iListWidget *, int dragHandleWidth);
 void    scrollToItem_ListWidget     (iListWidget *, size_t index, uint32_t span);
 void    scrollOffset_ListWidget     (iListWidget *, int offset);
 void    scrollOffsetSpan_ListWidget (iListWidget *, int offset, uint32_t span);
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index da0113ce..f14170ad 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -658,23 +658,37 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
              (equal_Command(cmd, "layout.changed") &&
               equal_Rangecc(range_Command(cmd, "id"), "navbar"))) {
         /* Position the lookup popup under the URL bar. */ {
-            iRoot *root = w->root;
+            iRoot    *root       = w->root;
+            iWidget  *url        = findChild_Widget(root->widget, "url");
+            const int minWidth   = iMin(120 * gap_UI, width_Rect(safeRect_Root(root)));
+            const int urlWidth   = width_Widget(url);
+            int       extraWidth = 0;
+            if (urlWidth < minWidth) {
+                extraWidth = minWidth - urlWidth;
+            }
             const iRect navBarBounds = bounds_Widget(findChild_Widget(root->widget, "navbar"));
-            iWidget *url = findChild_Widget(root->widget, "url");
-            setFixedSize_Widget(w, init_I2(width_Widget(url),
-                                           (bottom_Rect(rect_Root(root)) - bottom_Rect(navBarBounds)) / 2));
-            setPos_Widget(w, windowToLocal_Widget(w, bottomLeft_Rect(bounds_Widget(url))));
-#if defined (iPlatformAppleMobile)
+            setFixedSize_Widget(
+                w,
+                init_I2(width_Widget(url) + extraWidth,
+                        (bottom_Rect(rect_Root(root)) - bottom_Rect(navBarBounds)) / 2));
+            setPos_Widget(w,
+                          windowToLocal_Widget(w,
+                                               max_I2(zero_I2(),
+                                                      addX_I2(bottomLeft_Rect(bounds_Widget(url)),
+                                                              -extraWidth / 2))));
+#if defined(iPlatformMobile)
             /* TODO: Check this again. */
             /* Adjust height based on keyboard size. */ {
                 w->rect.size.y = bottom_Rect(visibleRect_Root(root)) - top_Rect(bounds_Widget(w));
+#   if defined (iPlatformAppleMobile)
                 if (deviceType_App() == phone_AppDeviceType) {
-                    float l, r;
+                    float l = 0.0f, r = 0.0f;
                     safeAreaInsets_iOS(&l, NULL, &r, NULL);
                     w->rect.size.x = size_Root(root).x - l - r;
                     w->rect.pos.x  = l;
                     /* TODO: Need to use windowToLocal_Widget? */
                 }
+#   endif
             }
 #endif
             arrange_Widget(w);
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index 4f2499b0..f0070688 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -104,7 +104,7 @@ static int drawSevenSegmentTime_(iInt2 pos, int color, int align, int seconds) {
     if (align == right_Alignment) {
         pos.x -= size.x;
     }
-    drawRange_Text(font, addY_I2(pos, -gap_UI / 8), color, range_String(&num));
+    drawRange_Text(font, addY_I2(pos, gap_UI / 2), color, range_String(&num));
     deinit_String(&num);
     return size.x;
 }
@@ -238,6 +238,56 @@ void init_DownloadUI(iDownloadUI *d, const iMedia *media, uint16_t mediaId, iRec
 /*----------------------------------------------------------------------------------------------*/
 
 iBool processEvent_DownloadUI(iDownloadUI *d, const SDL_Event *ev) {
+    if (ev->type == SDL_MOUSEBUTTONDOWN || ev->type == SDL_MOUSEBUTTONUP) {
+        const iInt2 mouse = init_I2(ev->button.x, ev->button.y);
+        if (!contains_Rect(d->bounds, mouse)) {
+            return iFalse;
+        }
+        float bytesPerSecond;
+        const iString *path;
+        iBool isFinished;
+        downloadStats_Media(d->media, (iMediaId){ download_MediaType, d->mediaId },
+                            &path, &bytesPerSecond, &isFinished);
+        if (isFinished) {
+            if (ev->button.button == SDL_BUTTON_RIGHT && ev->type == SDL_MOUSEBUTTONDOWN) {
+                const iMenuItem items[] = {
+                    /* Items related to the file */
+                    { openTab_Icon " ${menu.opentab}",
+                      0,
+                      0,
+                      format_CStr("!open newtab:1 url:%s",
+                                  cstrCollect_String(makeFileUrl_String(path))) },
+#if defined (iPlatformAppleDesktop)
+                    { "${menu.reveal.macos}",
+                      0,
+                      0,
+                      format_CStr("!reveal path:%s", cstr_String(path)) },
+#endif
+#if defined (iPlatformAppleMobile)
+                    { export_Icon " ${menu.share}",
+                      0,
+                      0,
+                      format_CStr("!reveal path:%s", cstr_String(path)) },
+#endif
+#if defined (iPlatformLinux)
+                    { "${menu.reveal.filemgr}",
+                      0,
+                      0,
+                      format_CStr("!reveal path:%s", cstr_String(path)) },
+#endif
+                    { "---" },
+                    /* Generic items */
+                    { "${menu.downloads}", 0, 0, "downloads.open newtab:1" },
+                };
+                openMenu_Widget(makeMenu_Widget(get_Root()->widget, items, iElemCount(items)),
+                                mouse);
+                return iTrue;
+            }
+            else if (ev->button.button == SDL_BUTTON_LEFT && ev->type == SDL_MOUSEBUTTONUP) {
+                postCommandf_App("open default:1 url:%s", cstrCollect_String(makeFileUrl_String(path)));
+            }
+        }
+    }
     return iFalse;
 }
 
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index abc91218..cf955423 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "mobile.h"
 
 #include "app.h"
+#include "certlistwidget.h"
 #include "command.h"
 #include "defs.h"
 #include "inputwidget.h"
@@ -36,14 +37,39 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #   include "ios.h"
 #endif
 
+const iToolbarActionSpec toolbarActions_Mobile[max_ToolbarAction] = {
+    { backArrow_Icon, "${menu.back}", "navigate.back" },
+    { forwardArrow_Icon, "${menu.forward}", "navigate.forward" },
+    { home_Icon, "${menu.home}", "navigate.home" },
+    { upArrow_Icon, "${menu.parent}", "navigate.parent" },
+    { reload_Icon, "${menu.reload}", "navigate.reload" },
+    { openTab_Icon, "${menu.newtab}", "tabs.new" },
+    { close_Icon, "${menu.closetab}", "tabs.close" },
+    { bookmark_Icon, "${menu.page.bookmark}", "bookmark.add" },
+    { globe_Icon, "${menu.page.translate}", "document.translate" },
+    { upload_Icon, "${menu.page.upload}", "document.upload" },
+    { edit_Icon, "${menu.page.upload.edit}", "document.upload copy:1" },
+    { magnifyingGlass_Icon, "${menu.find}", "focus.set id:find.input" },
+    { gear_Icon, "${menu.settings}", "preferences" },
+    { leftHalf_Icon, "${menu.sidebar.left}", "sidebar.toggle" },        
+};
+
 iBool isUsingPanelLayout_Mobile(void) {
     return deviceType_App() != desktop_AppDeviceType;
 }
 
+#define topPanelMinWidth_Mobile     (80 * gap_UI)
+
 static iBool isSideBySideLayout_(void) {
+    /* Minimum is an even split. */
+    const int safeWidth = safeRect_Root(get_Root()).size.x;
+    if (safeWidth / 2 < topPanelMinWidth_Mobile) {
+        return iFalse;
+    }
     if (deviceType_App() == phone_AppDeviceType) {
         return isLandscape_App();
     }
+    /* Tablet may still be too narrow. */
     return numRoots_Window(get_Window()) == 1;
 }
 
@@ -99,6 +125,16 @@ static iWidget *findTitleLabel_(iWidget *panel) {
     return NULL;
 }
 
+static void updateCertListHeight_(iWidget *detailStack) {
+    iWidget *certList = findChild_Widget(detailStack, "certlist");
+    if (certList) {
+        setFixedSize_Widget(certList,
+                            init_I2(-1,
+                                    -1 * gap_UI + bottom_Rect(safeRect_Root(certList->root)) -
+                                        top_Rect(boundsWithoutVisualOffset_Widget(certList))));
+    }
+}
+
 static iBool mainDetailSplitHandler_(iWidget *mainDetailSplit, const char *cmd) {
     if (equal_Command(cmd, "window.resized")) {
         const iBool  isPortrait   = (deviceType_App() == phone_AppDeviceType && isPortrait_App());
@@ -117,11 +153,13 @@ static iBool mainDetailSplitHandler_(iWidget *mainDetailSplit, const char *cmd)
         const int pad = isPortrait ? 0 : 3 * gap_UI;
         if (isSideBySide) {
             iAssert(topPanel);
-            topPanel->rect.size.x = (deviceType_App() == phone_AppDeviceType ?
-                                     safeRoot.size.x * 2 / 5 : (safeRoot.size.x / 3));
-        }        
+            topPanel->rect.size.x = iMax(topPanelMinWidth_Mobile,
+                                         (deviceType_App() == phone_AppDeviceType ?
+                                          safeRoot.size.x * 2 / 5 : safeRoot.size.x / 3));
+        }
         if (deviceType_App() == tablet_AppDeviceType) {
             setPadding_Widget(topPanel, pad, 0, pad, pad);
+#if 0
             if (numPanels == 0) {
                 setFlags_Widget(sheet, centerHorizontal_WidgetFlag, iTrue);
                 const int sheetWidth = iMin(safeRoot.size.x, safeRoot.size.y);
@@ -129,6 +167,7 @@ static iBool mainDetailSplitHandler_(iWidget *mainDetailSplit, const char *cmd)
                 setFixedSize_Widget(sheet, init_I2(sheetWidth, -1));
                 setFixedSize_Widget(navi, init_I2(sheetWidth, -1));
             }
+#endif
         }
         iWidget *detailTitle = findChild_Widget(navi, "detailtitle"); {
             setPos_Widget(detailTitle, init_I2(width_Widget(topPanel), 0));
@@ -143,9 +182,10 @@ static iBool mainDetailSplitHandler_(iWidget *mainDetailSplit, const char *cmd)
             if (isSideBySide) {
                 setVisualOffset_Widget(panel, 0, 0, 0);
             }
-            setPadding_Widget(panel, pad, 0, pad, pad);
+            setPadding_Widget(panel, pad, 0, pad, pad + bottomSafeInset_Mobile());
         }
         arrange_Widget(mainDetailSplit);
+        updateCertListHeight_(detailStack);
     }
     else if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
         if (focus_Widget() && class_Widget(focus_Widget()) == &Class_InputWidget) {
@@ -168,13 +208,16 @@ size_t currentPanelIndex_Mobile(const iWidget *panels) {
     return iInvalidPos;
 }
 
+iWidget *panel_Mobile(const iWidget *panels, size_t index) {
+    return child_Widget(findChild_Widget(panels, "detailstack"), index);
+}
+
 static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
     const iBool isPortrait = !isSideBySideLayout_();
     if (equal_Command(cmd, "panel.open")) {
-        iWidget *button = pointer_Command(cmd);
+        /* This command is sent by the button that opens the panel. */
+        iWidget *button = pointer_Command(cmd);        
         iWidget *panel = userData_Object(button);
-//        openMenu_Widget(panel, innerToWindow_Widget(panel, zero_I2()));
-//        setFlags_Widget(panel, hidden_WidgetFlag, iFalse);
         unselectAllPanelButtons_(topPanel);
         int panelIndex = -1;
         size_t childIndex = 0;
@@ -184,7 +227,7 @@ static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
             /* Animate the current panel in. */
             if (child == panel && isPortrait) {
                 setupSheetTransition_Mobile(panel, iTrue);
-                panelIndex = childIndex;
+                panelIndex = (int) childIndex;
             }
             childIndex++;
         }
@@ -196,6 +239,7 @@ static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
         setText_LabelWidget(detailTitle, text_LabelWidget((iLabelWidget *) findTitleLabel_(panel)));
         setFlags_Widget(button, selected_WidgetFlag, iTrue);
         postCommand_Widget(topPanel, "panel.changed arg:%d", panelIndex);
+        updateCertListHeight_(findDetailStack_(topPanel));
         return iTrue;
     }
     if (equal_Command(cmd, "swipe.back")) {
@@ -227,6 +271,10 @@ static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
             else if (findWidget_App("upload")) {
                 postCommand_App("upload.cancel");
             }
+            else if (findWidget_App("bmed.sidebar") || findWidget_App("bmed.create") ||
+                     findWidget_App("bmed")) {
+                postCommand_App("bmed.cancel");
+            }
             else if (findWidget_App("ident")) {
                 postCommand_Widget(topPanel, "ident.cancel");
             }
@@ -468,7 +516,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
     iLabelWidget *heading = NULL;
     iWidget *     value   = NULL;
     const char *  spec    = item->label;
-    const char *  id      = cstr_Rangecc(range_Command(spec, "id"));
+    const char *  id      = cstr_Command(spec, "id");
     const char *  label   = hasLabel_Command(spec, "text")
                                 ? suffixPtr_Command(spec, "text")
                                 : format_CStr("${%s}", id);
@@ -482,7 +530,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                                                    collapse_WidgetFlag);
         setFont_LabelWidget(title, uiLabelLargeBold_FontId);
         setTextColor_LabelWidget(title, uiHeading_ColorId);
-        setAllCaps_LabelWidget(title, iTrue);
+//        setAllCaps_LabelWidget(title, iTrue);
         setId_Widget(as_Widget(title), id);
     }
     else if (equal_Command(spec, "heading")) {
@@ -511,10 +559,12 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
         setId_Widget(as_Widget(drop), id);
         widget = makeValuePaddingWithHeading_(heading = makeHeading_Widget(label), as_Widget(drop));
         setCommandHandler_Widget(widget, dropdownHeadingHandler_);
+        widget->padding[2] = gap_UI;
         setUserData_Object(widget, drop);
     }
     else if (equal_Command(spec, "radio") || equal_Command(spec, "buttons")) {
         const iBool isRadio = equal_Command(spec, "radio");
+        const iBool isHorizontal = argLabel_Command(spec, "horizontal");
         addChild_Widget(panel, iClob(makePadding_Widget(lineHeight_Text(labelFont_()))));
         iLabelWidget *head = makeHeading_Widget(label);
         setAllCaps_LabelWidget(head, iTrue);
@@ -522,25 +572,42 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
         addChild_Widget(panel, iClob(head));
         widget = new_Widget();
         setBackgroundColor_Widget(widget, uiBackgroundSidebar_ColorId);
-        setPadding_Widget(widget, 4 * gap_UI, 2 * gap_UI, 4 * gap_UI, 2 * gap_UI);
+        const int hPad = (isHorizontal ? 0 : 1);
+        setPadding_Widget(widget, hPad * gap_UI, 2 * gap_UI, hPad * gap_UI, 2 * gap_UI);
         setFlags_Widget(widget,
                         borderTop_WidgetFlag |
                             borderBottom_WidgetFlag |
-                            arrangeHorizontal_WidgetFlag |
+                            (isHorizontal ? arrangeHorizontal_WidgetFlag : arrangeVertical_WidgetFlag) |
                             arrangeHeight_WidgetFlag |
                             resizeToParentWidth_WidgetFlag |
                             resizeWidthOfChildren_WidgetFlag,
                         iTrue);
         setId_Widget(widget, id);
+        iBool isFirst = iTrue;
         for (const iMenuItem *radioItem = item->data; radioItem->label; radioItem++) {
-            const char *  radId = cstr_Rangecc(range_Command(radioItem->label, "id"));
-            int64_t       flags = noBackground_WidgetFlag;
+            if (!isHorizontal && !isFirst) {
+                /* The separator is padded from the left so we need two. */
+                iWidget *sep = new_Widget();
+                iWidget *sep2 = new_Widget();
+                addChildFlags_Widget(sep, iClob(sep2), 0);
+                setFlags_Widget(sep, arrangeHeight_WidgetFlag | resizeWidthOfChildren_WidgetFlag, iTrue);
+                setBackgroundColor_Widget(sep2, uiSeparator_ColorId);
+                setFixedSize_Widget(sep2, init_I2(-1, gap_UI / 4));
+                setPadding_Widget(sep, 5 * gap_UI, 0, 0, 0);
+                addChildFlags_Widget(widget, iClob(sep), 0);
+            }
+            isFirst = iFalse;
+            const char *  radId = cstr_Command(radioItem->label, "id");
+            int64_t       flags = noBackground_WidgetFlag | frameless_WidgetFlag;
+            if (!isHorizontal) {
+                flags |= alignLeft_WidgetFlag;
+            }
             iLabelWidget *button;
             if (isRadio) {
                 const char *radLabel =
                     hasLabel_Command(radioItem->label, "label")
                         ? format_CStr("${%s}",
-                                      cstr_Rangecc(range_Command(radioItem->label, "label")))
+                                      cstr_Command(radioItem->label, "label"))
                         : suffixPtr_Command(radioItem->label, "text");
                 button = new_LabelWidget(radLabel, radioItem->command);
                 flags |= radio_WidgetFlag;
@@ -549,17 +616,21 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                 button = (iLabelWidget *) makeToggle_Widget(radId);
                 setTextCStr_LabelWidget(button, format_CStr("${%s}", radId));
                 setFlags_Widget(as_Widget(button), fixedWidth_WidgetFlag, iFalse);
-                updateSize_LabelWidget(button);
             }
             setId_Widget(as_Widget(button), radId);
-            setFont_LabelWidget(button, uiLabelMedium_FontId);
+            setFont_LabelWidget(button, deviceType_App() == phone_AppDeviceType ?
+                                (isHorizontal ? uiLabelMedium_FontId : uiLabelBig_FontId) : labelFont_());
+            setCheckMark_LabelWidget(button, !isHorizontal);
+            setPadding_Widget(as_Widget(button), gap_UI, 1 * gap_UI, 0, 1 * gap_UI);
+            updateSize_LabelWidget(button);
+            setPadding_Widget(widget, 0, 0, 0, 0);
             addChildFlags_Widget(widget, iClob(button), flags);
         }
     }
     else if (equal_Command(spec, "input")) {
         iInputWidget *input = new_InputWidget(argU32Label_Command(spec, "maxlen"));
         if (hasLabel_Command(spec, "hint")) {
-            setHint_InputWidget(input, cstr_Lang(cstr_Rangecc(range_Command(spec, "hint"))));
+            setHint_InputWidget(input, cstr_Lang(cstr_Command(spec, "hint")));
         }
         setId_Widget(as_Widget(input), id);
         setUrlContent_InputWidget(input, argLabel_Command(spec, "url"));
@@ -570,12 +641,13 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
             setFlags_Widget(widget, expand_WidgetFlag, iTrue);
         }
         else {
+            setFlags_Widget(as_Widget(input), alignRight_WidgetFlag, iTrue);
             setContentPadding_InputWidget(input, 3 * gap_UI, 0);
             if (hasLabel_Command(spec, "unit")) {
                 iWidget *unit = addChildFlags_Widget(
                     as_Widget(input),
                     iClob(new_LabelWidget(
-                        format_CStr("${%s}", cstr_Rangecc(range_Command(spec, "unit"))), NULL)),
+                        format_CStr("${%s}", cstr_Command(spec, "unit")), NULL)),
                     frameless_WidgetFlag | moveToParentRightEdge_WidgetFlag |
                         resizeToParentHeight_WidgetFlag);
                 setContentPadding_InputWidget(input, -1, width_Widget(unit) - 4 * gap_UI);
@@ -586,6 +658,14 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
             setUserData_Object(widget, input);
         }
     }
+    else if (equal_Command(spec, "certlist")) {
+        iCertListWidget *certList = new_CertListWidget();
+        iListWidget *list = (iListWidget *) certList;
+        setBackgroundColor_Widget(as_Widget(list), uiBackgroundSidebar_ColorId);
+        widget = as_Widget(certList);
+        updateItems_CertListWidget(certList);
+        invalidate_ListWidget(list);
+    }
     else if (equal_Command(spec, "button")) {
         widget = as_Widget(heading = makePanelButton_(label, item->command));
         setFlags_Widget(widget, selected_WidgetFlag, argLabel_Command(spec, "selected") != 0);
@@ -599,6 +679,9 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                         fixedHeight_WidgetFlag |
                             (!argLabel_Command(spec, "frame") ? frameless_WidgetFlag : 0),
                         iTrue);
+        if (argLabel_Command(spec, "font")) {
+            setFont_LabelWidget(lab, argLabel_Command(spec, "font"));
+        }
     }
     else if (equal_Command(spec, "padding")) {
         float height = 1.5f;
@@ -670,8 +753,10 @@ void initPanels_Mobile(iWidget *panels, iWidget *parentWidget,
     setFlags_Widget(panels,
                     resizeToParentWidth_WidgetFlag | resizeToParentHeight_WidgetFlag |
                         frameless_WidgetFlag | focusRoot_WidgetFlag | commandOnClick_WidgetFlag |
+                        horizontalOffset_WidgetFlag |
                         /*overflowScrollable_WidgetFlag |*/ leftEdgeDraggable_WidgetFlag,
                     iTrue);
+    panels->flags2 |= fadeBackground_WidgetFlag2;
     setFlags_Widget(panels, overflowScrollable_WidgetFlag, iFalse);
     /* The top-level split between main and detail panels. */
     iWidget *mainDetailSplit = makeHDiv_Widget(); {
@@ -733,7 +818,7 @@ void initPanels_Mobile(iWidget *panels, iWidget *parentWidget,
         const iMenuItem *item = &itemsNullTerminated[i];
         if (equal_Command(item->label, "panel")) {
             haveDetailPanels = iTrue;
-            const char *id = cstr_Rangecc(range_Command(item->label, "id"));
+            const char *id = cstr_Command(item->label, "id");
             const iString *label = hasLabel_Command(item->label, "text")
                                        ? collect_String(suffix_Command(item->label, "text"))
                                        : collectNewFormat_String("${%s}", id);
@@ -849,18 +934,21 @@ void setupMenuTransition_Mobile(iWidget *sheet, iBool isIncoming) {
     if (!isUsingPanelLayout_Mobile()) {
         return;    
     }
-    const iBool isSlidePanel = (flags_Widget(sheet) & horizontalOffset_WidgetFlag) != 0;
-    if (isSlidePanel && isLandscape_App()) {
+    const iBool isHorizPanel = (flags_Widget(sheet) & horizontalOffset_WidgetFlag) != 0;
+    if (isHorizPanel && isLandscape_App()) {
         return;
     }
+    const int maxOffset = isHorizPanel            ? width_Widget(sheet)
+                          : isPortraitPhone_App() ? height_Widget(sheet)
+                                                  : (12 * gap_UI);
     if (isIncoming) {
-        setVisualOffset_Widget(sheet, isSlidePanel ? width_Widget(sheet) : height_Widget(sheet), 0, 0);
+        setVisualOffset_Widget(sheet, maxOffset, 0, 0);
         setVisualOffset_Widget(sheet, 0, 330, easeOut_AnimFlag | softer_AnimFlag);
     }
     else {
         const iBool wasDragged = iAbs(value_Anim(&sheet->visualOffset) - 0) > 1;
         setVisualOffset_Widget(sheet,
-                               isSlidePanel ? width_Widget(sheet) : height_Widget(sheet),
+                               maxOffset,
                                wasDragged ? 100 : 200,
                                wasDragged ? 0 : easeIn_AnimFlag | softer_AnimFlag);
     }
@@ -930,3 +1018,13 @@ void setupSheetTransition_Mobile(iWidget *sheet, int flags) {
         }
     }
 }
+
+int bottomSafeInset_Mobile(void) {
+#if defined (iPlatformAppleMobile)
+    float bot;
+    safeAreaInsets_iOS(NULL, NULL, NULL, &bot);
+    return iRound(bot);
+#else
+    return 0;
+#endif
+}
diff --git a/src/ui/mobile.h b/src/ui/mobile.h
index 9d7ac8e4..a719f20b 100644
--- a/src/ui/mobile.h
+++ b/src/ui/mobile.h
@@ -22,8 +22,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
+#include "defs.h"
 #include <the_Foundation/rect.h>
 
+iDeclareType(ToolbarActionSpec)
+    
+struct Impl_ToolbarActionSpec {
+    const char *icon;
+    const char *label;
+    const char *command;
+};
+
+extern const iToolbarActionSpec toolbarActions_Mobile[max_ToolbarAction];
+
 iDeclareType(Widget)
 iDeclareType(MenuItem)
     
@@ -39,6 +50,7 @@ void        initPanels_Mobile           (iWidget *panels, iWidget *parentWidget,
                                          const iMenuItem *itemsNullTerminated,
                                          const iMenuItem *actions, size_t numActions);
 
+iWidget *   panel_Mobile                (const iWidget *panels, size_t index);
 size_t      currentPanelIndex_Mobile    (const iWidget *panels);
 
 enum iTransitionFlags {
@@ -55,3 +67,5 @@ enum iTransitionDir {
 
 void        setupMenuTransition_Mobile  (iWidget *menu,  iBool isIncoming);
 void        setupSheetTransition_Mobile (iWidget *sheet, int flags);
+
+int         bottomSafeInset_Mobile      (void);
diff --git a/src/ui/paint.c b/src/ui/paint.c
index b92be27e..5e66f521 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -41,6 +41,7 @@ void init_Paint(iPaint *d) {
     d->dst       = get_Window();
     d->setTarget = NULL;
     d->oldTarget = NULL;
+    d->oldOrigin = zero_I2();
     d->alpha     = 255;
 }
 
@@ -48,6 +49,8 @@ void beginTarget_Paint(iPaint *d, SDL_Texture *target) {
     SDL_Renderer *rend = renderer_Paint_(d);
     if (!d->setTarget) {
         d->oldTarget = SDL_GetRenderTarget(rend);
+        d->oldOrigin = origin_Paint;
+        origin_Paint = zero_I2();
         SDL_SetRenderTarget(rend, target);
         d->setTarget = target;
     }
@@ -59,8 +62,10 @@ void beginTarget_Paint(iPaint *d, SDL_Texture *target) {
 void endTarget_Paint(iPaint *d) {
     if (d->setTarget) {
         SDL_SetRenderTarget(renderer_Paint_(d), d->oldTarget);
+        origin_Paint = d->oldOrigin;
+        d->oldOrigin = zero_I2();
         d->oldTarget = NULL;
-        d->setTarget = NULL;
+        d->setTarget = NULL;        
     }
 }
 
@@ -108,7 +113,7 @@ void drawRect_Paint(const iPaint *d, iRect rect, int color) {
         { left_Rect(rect),  br.y },
         { left_Rect(rect),  top_Rect(rect) }
     };
-#if SDL_VERSION_ATLEAST(2, 0, 16)
+#if SDL_COMPILEDVERSION == SDL_VERSIONNUM(2, 0, 16)
     if (isOpenGLRenderer_Window()) {
         /* A very curious regression in SDL 2.0.16. */
         edges[3].y--;
@@ -170,7 +175,7 @@ void drawLines_Paint(const iPaint *d, const iInt2 *points, size_t n, int color)
     for (size_t i = 0; i < n; i++) {
         offsetPoints[i] = add_I2(points[i], origin_Paint);
     }
-    SDL_RenderDrawLines(renderer_Paint_(d), (const SDL_Point *) offsetPoints, n);
+    SDL_RenderDrawLines(renderer_Paint_(d), (const SDL_Point *) offsetPoints, (int) n);
     free(offsetPoints);
 }
 
diff --git a/src/ui/paint.h b/src/ui/paint.h
index e894b62f..dfc9260d 100644
--- a/src/ui/paint.h
+++ b/src/ui/paint.h
@@ -33,6 +33,7 @@ struct Impl_Paint {
     iWindow *    dst;
     SDL_Texture *setTarget;
     SDL_Texture *oldTarget;
+    iInt2        oldOrigin;
     uint8_t      alpha;
 };
 
diff --git a/src/ui/root.c b/src/ui/root.c
index cf13169d..5c4296cf 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -38,6 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "../history.h"
 #include "../gmcerts.h"
 #include "../gmutil.h"
+#include "../sitespec.h"
 #include "../visited.h"
 
 #if defined (iPlatformMsys)
@@ -94,16 +95,16 @@ static const iMenuItem tabletNavMenuItems_[] = {
     { close_Icon " ${menu.closetab}", 'w', KMOD_PRIMARY, "tabs.close" },
     { "---" },
     { magnifyingGlass_Icon " ${menu.find}", 0, 0, "focus.set id:find.input" },
-    { leftHalf_Icon " ${menu.sidebar.left}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+//    { leftHalf_Icon " ${menu.sidebar.left}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { rightHalf_Icon " ${menu.sidebar.right}", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
     { "${menu.view.split}", SDLK_j, KMOD_PRIMARY, "splitmenu.open" },
     { "---" },
     { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" },
     { "${menu.bookmarks.bytag}", 0, 0, "!open url:about:bookmarks?tags" },
     { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" },
-    { "${menu.downloads}", 0, 0, "downloads.open" },
+    //{ "${menu.downloads}", 0, 0, "downloads.open" },
     { "---" },
-    { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
+    { gear_Icon " ${menu.settings}", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
     { "${menu.help}", SDLK_F1, 0, "!open url:about:help" },
     { "${menu.releasenotes}", 0, 0, "!open url:about:version" },
 };
@@ -115,10 +116,10 @@ static const iMenuItem phoneNavMenuItems_[] = {
     { close_Icon " ${menu.closetab}", 'w', KMOD_PRIMARY, "tabs.close" },
     { "---" },
     { magnifyingGlass_Icon " ${menu.find}", 0, 0, "focus.set id:find.input" },
-    { leftHalf_Icon " ${menu.sidebar}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+//    { leftHalf_Icon " ${menu.sidebar}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "---" },
     { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" },
-    { "${menu.downloads}", 0, 0, "downloads.open" },
+    //{ "${menu.downloads}", 0, 0, "downloads.open" },
     { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" },
     { "---" },
     { gear_Icon " ${menu.settings}", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
@@ -240,6 +241,7 @@ static int       loadAnimIndex_      = 0;
 static iRoot *   activeRoot_     = NULL;
 
 iDefineTypeConstruction(Root)
+iDefineAudienceGetter(Root, visualOffsetsChanged)
 
 void init_Root(iRoot *d) {
     iZap(*d);
@@ -249,6 +251,7 @@ void deinit_Root(iRoot *d) {
     iReleasePtr(&d->widget);
     delete_PtrArray(d->onTop);
     delete_PtrSet(d->pendingDestruction);
+    delete_Audience(d->visualOffsetsChanged);
 }
 
 void setCurrent_Root(iRoot *root) {
@@ -315,9 +318,12 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
     if (equal_Command(cmd, "menu.open")) {
         iWidget *button = pointer_Command(cmd);
         iWidget *menu = findChild_Widget(button, "menu");
+        const iBool isPlacedUnder = argLabel_Command(cmd, "under");
         iAssert(menu);
         if (!isVisible_Widget(menu)) {
-            openMenu_Widget(menu, topLeft_Rect(bounds_Widget(button)));
+            openMenu_Widget(menu,
+                            isPlacedUnder ? bottomLeft_Rect(bounds_Widget(button))
+                                          : topLeft_Rect(bounds_Widget(button)));
         }
         else {
             closeMenu_Widget(menu);
@@ -330,6 +336,93 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         openMenuFlags_Widget(menu, zero_I2(), postCommands_MenuOpenFlags | center_MenuOpenFlags);
         return iTrue;
     }
+    else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "toolbar.showident")) {
+        /* No toolbar on tablet, so we handle this command here. */
+        postCommand_App("preferences idents:1");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "identmenu.open")) {
+        iWidget *toolBar = findWidget_Root("toolbar");
+        iWidget *button = findWidget_Root(toolBar && isPortraitPhone_App() ? "toolbar.ident" : "navbar.ident");
+        iArray items;
+        init_Array(&items, sizeof(iMenuItem));
+        /* Current identity. */
+        const iString     *docUrl = url_DocumentWidget(document_App());
+        const iGmIdentity *ident  = identityForUrl_GmCerts(certs_App(), docUrl);
+        const iString     *fp     = ident ? collect_String(hexEncode_Block(&ident->fingerprint)) : NULL;
+        iString           *str    = NULL;
+        if (ident) {
+            str = copy_String(name_GmIdentity(ident));
+            if (!isEmpty_String(&ident->notes)) {
+                appendFormat_String(str, "\n\x1b[0m" uiHeading_ColorEscape "%s", cstr_String(&ident->notes));
+            }
+        }
+        pushBack_Array(
+            &items,
+            &(iMenuItem){ format_CStr("```" uiHeading_ColorEscape "\x1b[1m%s",
+                                      str ? cstr_String(str) : "${menu.identity.notactive}") });
+        if (ident && isUsedOn_GmIdentity(ident, docUrl)) {
+            pushBack_Array(&items,
+                           &(iMenuItem){ close_Icon " ${ident.stopuse}",
+                                         0,
+                                         0,
+                                         format_CStr("ident.signout ident:%s url:%s",
+                                                     cstr_String(fp),
+                                                     cstr_String(docUrl)) });
+        }
+        pushBack_Array(&items, &(iMenuItem){ "---" });
+        delete_String(str);
+        /* Alternate identities. */
+        const iString *site = collectNewRange_String(urlRoot_String(docUrl));
+        iBool haveAlts = iFalse;
+        iConstForEach(StringArray, i, strings_SiteSpec(site, usedIdentities_SiteSpecKey)) {
+            if (!fp || !equal_String(i.value, fp)) {
+                const iBlock *otherFp = collect_Block(hexDecode_Rangecc(range_String(i.value)));
+                const iGmIdentity *other = findIdentity_GmCerts(certs_App(), otherFp);
+                if (other && other != ident) {
+                    pushBack_Array(
+                        &items,
+                        &(iMenuItem){
+                            format_CStr(translateCStr_Lang("\U0001f816 ${ident.switch}"),
+                                        format_CStr("\x1b[1m%s",
+                                                    cstr_String(name_GmIdentity(other)))),
+                            0,
+                            0,
+                            format_CStr("ident.switch fp:%s", cstr_String(i.value)) });
+                    haveAlts = iTrue;
+                }
+            }
+        }
+        if (haveAlts) {
+            pushBack_Array(&items, &(iMenuItem){ "---" });
+        }
+        iSidebarWidget *sidebar = findWidget_App("sidebar");
+        pushBackN_Array(
+            &items,
+            (iMenuItem[]){
+                { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" },
+                { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" },
+                { "---" } }, 3);
+        if (deviceType_App() == desktop_AppDeviceType) {
+            pushBack_Array(&items,
+                           &(iMenuItem){ isVisible_Widget(sidebar) && mode_SidebarWidget(sidebar) ==
+                                                                          identities_SidebarMode
+                                             ? leftHalf_Icon " ${menu.hide.identities}"
+                                             : leftHalf_Icon " ${menu.show.identities}",
+                                         0,
+                                         0,
+                                         "sidebar.mode arg:3 toggle:1" });
+        }
+        else {
+            pushBack_Array(&items, &(iMenuItem){ gear_Icon " ${menu.identities}", 0, 0,
+                                                 "toolbar.showident"});
+        }
+        iWidget *menu =
+            makeMenu_Widget(button, constData_Array(&items), size_Array(&items));
+        openMenu_Widget(menu, bottomLeft_Rect(bounds_Widget(button)));
+        deinit_Array(&items);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "contextclick")) {
         iBool showBarMenu = iFalse;
         if (equal_Rangecc(range_Command(cmd, "id"), "buttons")) {
@@ -351,7 +444,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         return iFalse;
     }
     else if (equal_Command(cmd, "focus.set")) {
-        setFocus_Widget(findWidget_App(cstr_Rangecc(range_Command(cmd, "id"))));
+        setFocus_Widget(findWidget_App(cstr_Command(cmd, "id")));
         return iTrue;
     }
     else if (equal_Command(cmd, "input.resized")) {
@@ -401,14 +494,38 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         SDL_PushEvent(&(SDL_Event){ .type = SDL_QUIT });
         return iTrue;
     }
+    else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "window.resized")) {
+        iSidebarWidget *sidebar = findChild_Widget(root, "sidebar");
+        iSidebarWidget *sidebar2 = findChild_Widget(root, "sidebar2");
+        setWidth_SidebarWidget(sidebar, 73.0f);
+        setWidth_SidebarWidget(sidebar2, 73.0f);
+        return iFalse;
+    }
     else if (deviceType_App() == phone_AppDeviceType && equal_Command(cmd, "window.resized")) {
         /* Place the sidebar next to or under doctabs depending on orientation. */
         iSidebarWidget *sidebar = findChild_Widget(root, "sidebar");
-        iSidebarWidget *sidebar2 = findChild_Widget(root, "sidebar2");
         removeChild_Widget(parent_Widget(sidebar), sidebar);
-        //        setBackgroundColor_Widget(findChild_Widget(as_Widget(sidebar), "buttons"),
-        //                                  isPortrait_App() ? uiBackgroundUnfocusedSelection_ColorId
-        //                                                   : uiBackgroundSidebar_ColorId);
+        iChangeFlags(as_Widget(sidebar)->flags2, fadeBackground_WidgetFlag2, isPortrait_App());
+        if (isLandscape_App()) {
+            setVisualOffset_Widget(as_Widget(sidebar), 0, 0, 0);
+            addChildPos_Widget(findChild_Widget(root, "tabs.content"), iClob(sidebar), front_WidgetAddPos);            
+            setWidth_SidebarWidget(sidebar, 73.0f);
+            setFlags_Widget(as_Widget(sidebar), fixedHeight_WidgetFlag | fixedPosition_WidgetFlag, iFalse);
+        }
+        else {
+            addChild_Widget(root, iClob(sidebar));
+            setWidth_SidebarWidget(sidebar, (float) width_Widget(root) / (float) gap_UI);
+            int midHeight = height_Widget(root) / 2;// + lineHeight_Text(uiLabelLarge_FontId);
+#if defined (iPlatformAndroidMobile)
+            midHeight += 2 * lineHeight_Text(uiLabelLarge_FontId);
+#endif
+            setMidHeight_SidebarWidget(sidebar, midHeight);
+            setFixedSize_Widget(as_Widget(sidebar), init_I2(-1, midHeight));
+            setPos_Widget(as_Widget(sidebar), init_I2(0, height_Widget(root) - midHeight));
+        }
+#if 0
+        iSidebarWidget *sidebar = findChild_Widget(root, "sidebar");
+        iSidebarWidget *sidebar2 = findChild_Widget(root, "sidebar2");
         setFlags_Widget(findChild_Widget(as_Widget(sidebar), "buttons"),
                         borderTop_WidgetFlag,
                         isPortrait_App());
@@ -424,6 +541,20 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
             setWidth_SidebarWidget(sidebar, (float) width_Widget(root) / (float) gap_UI);
             setWidth_SidebarWidget(sidebar2, (float) width_Widget(root) / (float) gap_UI);
         }
+#endif
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "root.arrange")) {
+        iWidget *prefs = findWidget_Root("prefs");
+        if (prefs) {
+            updatePreferencesLayout_Widget(prefs);
+        }
+        root->root->pendingArrange = iFalse;
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "theme.changed")) {
+        /* The phone toolbar is draw-buffered so it needs refreshing. */
+        refresh_Widget(findWidget_App("toolbar"));
         return iFalse;
     }
     else if (handleCommand_App(cmd)) {
@@ -449,22 +580,54 @@ static void updateNavBarIdentity_(iWidget *navBar) {
     iLabelWidget *toolName = findWidget_App("toolbar.name");
     if (toolName) {
         setOutline_LabelWidget(toolButton, ident == NULL);
-        updateTextCStr_LabelWidget(toolName, subjectName ? cstr_String(subjectName) : "");
+        /* Fit the name in the widget. */ 
+        if (subjectName) {
+            const char *endPos;
+            tryAdvanceNoWrap_Text(uiLabelTiny_FontId, range_String(subjectName), width_Widget(toolName),
+                &endPos);
+            updateText_LabelWidget(
+                toolName,
+                collectNewRange_String((iRangecc){ constBegin_String(subjectName), endPos }));
+        }
+        else {
+            updateTextCStr_LabelWidget(toolName, "");
+        }
         setFont_LabelWidget(toolButton, subjectName ? uiLabelMedium_FontId : uiLabelLarge_FontId);
-        arrange_Widget(parent_Widget(toolButton));
+        setTextOffset_LabelWidget(toolButton, init_I2(0, subjectName ? -1.5f * gap_UI : 0));
+        arrange_Widget(parent_Widget(toolButton));        
     }
 }
 
 static void updateNavDirButtons_(iWidget *navBar) {
-    const iHistory *history = history_DocumentWidget(document_App());
-    setFlags_Widget(findChild_Widget(navBar, "navbar.back"), disabled_WidgetFlag,
-                    atOldest_History(history));
-    setFlags_Widget(findChild_Widget(navBar, "navbar.forward"), disabled_WidgetFlag,
-                    atLatest_History(history));
-    setFlags_Widget(findWidget_App("toolbar.back"), disabled_WidgetFlag,
-                    atOldest_History(history));
-    setFlags_Widget(findWidget_App("toolbar.forward"), disabled_WidgetFlag,
-                    atLatest_History(history));
+    iBeginCollect();
+    const iHistory *history  = history_DocumentWidget(document_App());
+    const iBool     atOldest = atOldest_History(history);
+    const iBool     atNewest = atNewest_History(history);
+    /* Reset button state. */
+    for (size_t i = 0; i < maxNavbarActions_Prefs; i++) {
+        const char *id = format_CStr("navbar.action%d", i + 1);
+        setFlags_Widget(findChild_Widget(navBar, id), disabled_WidgetFlag, iFalse);
+    }
+    setFlags_Widget(as_Widget(findMenuItem_Widget(navBar, "navigate.back")), disabled_WidgetFlag, atOldest);
+    setFlags_Widget(as_Widget(findMenuItem_Widget(navBar, "navigate.forward")), disabled_WidgetFlag, atNewest);
+    iWidget *toolBar = findWidget_App("toolbar");
+    if (toolBar) {
+        /* Reset the state. */
+        for (int i = 0; i < 2; i++) {
+            const char *id = (i == 0 ? "toolbar.action1" : "toolbar.action2");            
+            setFlags_Widget(findChild_Widget(toolBar, id), disabled_WidgetFlag, iFalse);
+            setOutline_LabelWidget(findChild_Widget(toolBar, id), iFalse);
+        }
+        /* Disable certain actions. */
+        iLabelWidget *back = findMenuItem_Widget(toolBar, "navigate.back");
+        iLabelWidget *fwd  = findMenuItem_Widget(toolBar, "navigate.forward");
+        setFlags_Widget(as_Widget(back), disabled_WidgetFlag, atOldest);
+        setOutline_LabelWidget(back, atOldest);
+        setFlags_Widget(as_Widget(fwd), disabled_WidgetFlag, atNewest);
+        setOutline_LabelWidget(fwd, atNewest);
+        refresh_Widget(toolBar);
+    }
+    iEndCollect();
 }
 
 static const char *loadAnimationCStr_(void) {
@@ -502,10 +665,10 @@ static void checkLoadAnimation_Root_(iRoot *d) {
 
 void updatePadding_Root(iRoot *d) {
     if (d == NULL) return;
-    iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
-    float bottom = 0.0f;
 #if defined (iPlatformAppleMobile)
+    iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
     float left, top, right;
+    float bottom = 0.0f;
     safeAreaInsets_iOS(&left, &top, &right, &bottom);
     /* Respect the safe area insets. */ {
         setPadding_Widget(findChild_Widget(d->widget, "navdiv"), left, top, right, 0);
@@ -514,15 +677,6 @@ void updatePadding_Root(iRoot *d) {
         }
     }
 #endif
-    if (toolBar) {
-        /* TODO: get this from toolBar height, but it's buggy for some reason */
-        const int sidebarBottomPad = isPortrait_App() ? 11 * gap_UI + bottom : 0;
-        setPadding_Widget(findChild_Widget(d->widget, "sidebar"), 0, 0, 0, sidebarBottomPad);
-        setPadding_Widget(findChild_Widget(d->widget, "sidebar2"), 0, 0, 0, sidebarBottomPad);
-        /* TODO: There seems to be unrelated layout glitch in the sidebar where its children
-           are not arranged correctly until it's hidden and reshown. */
-    }
-    /* Note that `handleNavBarCommands_` also adjusts padding and spacing. */
 }
 
 void updateToolbarColors_Root(iRoot *d) {
@@ -536,17 +690,25 @@ void updateToolbarColors_Root(iRoot *d) {
                                           tmBannerBackground_ColorId;
         setBackgroundColor_Widget(toolBar, bg);
         iForEach(ObjectList, i, children_Widget(toolBar)) {
-            iLabelWidget *btn = i.object;
+//            iLabelWidget *btn = i.object;
             setTextColor_LabelWidget(i.object, isSidebarVisible ? uiTextDim_ColorId :
                                      tmBannerIcon_ColorId);
             setBackgroundColor_Widget(i.object, bg); /* using noBackground, but ident has outline */
         }
+        setTextColor_LabelWidget(findChild_Widget(toolBar, "toolbar.name"),
+                                 isSidebarVisible ? uiTextDim_ColorId : tmBannerIcon_ColorId);
     }
 #else
     iUnused(d);
 #endif
 }
 
+void notifyVisualOffsetChange_Root(iRoot *d) {
+    if (d && (d->didAnimateVisualOffsets || d->didChangeArrangement)) {
+        iNotifyAudience(d, visualOffsetsChanged, RootVisualOffsetsChanged);
+    }
+}
+
 void dismissPortraitPhoneSidebars_Root(iRoot *d) {
     if (deviceType_App() == phone_AppDeviceType && isPortrait_App()) {
         iWidget *sidebar = findChild_Widget(d->widget, "sidebar");
@@ -617,16 +779,15 @@ static void updateNavBarSize_(iWidget *navBar) {
     const iBool isPhone = deviceType_App() == phone_AppDeviceType;
     const iBool isNarrow = !isPhone && isNarrow_Root(navBar->root);
     /* Adjust navbar padding. */ {
-        int hPad = isPhone && isPortrait_App() ? 0 : (isPhone || isNarrow) ? gap_UI / 2
-                                                                             : gap_UI * 3 / 2;
-        int vPad = gap_UI * 3 / 2;
+        int hPad = isPortraitPhone_App() ? 0 : isPhone || isNarrow ? gap_UI / 2 : (gap_UI * 3 / 2);
+        int vPad   = gap_UI * 3 / 2;
         int topPad = !findWidget_Root("winbar") ? gap_UI / 2 : 0;
         setPadding_Widget(navBar, hPad, vPad / 3 + topPad, hPad, vPad / 2);
     }
     /* Button sizing. */
     if (isNarrow ^ ((flags_Widget(navBar) & tight_WidgetFlag) != 0)) {
         setFlags_Widget(navBar, tight_WidgetFlag, isNarrow);
-        showCollapsed_Widget(findChild_Widget(navBar, "navbar.sidebar"), !isNarrow);
+        showCollapsed_Widget(findChild_Widget(navBar, "navbar.action3"), !isNarrow);
         iObjectList *lists[] = {
             children_Widget(navBar),
             children_Widget(findChild_Widget(navBar, "url")),
@@ -647,8 +808,8 @@ static void updateNavBarSize_(iWidget *navBar) {
         updateUrlInputContentPadding_(navBar);
     }
     if (isPhone) {
-        static const char *buttons[] = { "navbar.back",  "navbar.forward", "navbar.sidebar",
-                                         "navbar.ident", "navbar.home",    "navbar.menu" };
+        static const char *buttons[] = { "navbar.action1", "navbar.action2", "navbar.action3",
+                                         "navbar.action4", "navbar.ident",   "navbar.menu" };
         iWidget *toolBar = findWidget_Root("toolbar");
         setVisualOffset_Widget(toolBar, 0, 0, 0);
         setFlags_Widget(toolBar, hidden_WidgetFlag, isLandscape_App());
@@ -673,6 +834,22 @@ static void updateNavBarSize_(iWidget *navBar) {
     postCommand_Widget(navBar, "layout.changed id:navbar");
 }
 
+static void updateNavBarActions_(iWidget *navBar) {
+    const iPrefs *prefs = prefs_App();
+    for (size_t i = 0; i < iElemCount(prefs->navbarActions); i++) {
+        iBeginCollect();
+        const int action = prefs->navbarActions[i];
+        iLabelWidget *button =
+            findChild_Widget(navBar, format_CStr("navbar.action%d", i + 1));
+        if (button) {
+            setFlags_Widget(as_Widget(button), disabled_WidgetFlag, iFalse);
+            updateTextCStr_LabelWidget(button, toolbarActions_Mobile[action].icon);
+            setCommand_LabelWidget(button, collectNewCStr_String(toolbarActions_Mobile[action].command));
+        }
+        iEndCollect();
+    }
+}
+
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "metrics.changed")) {
         updateNavBarSize_(navBar);
@@ -685,7 +862,41 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "navbar.actions.changed")) {
+        updateNavBarActions_(navBar);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "contextclick")) {
+        const iRangecc id = range_Command(cmd, "id");
+        if (id.start && startsWith_CStr(id.start, "navbar.action")) {
+            const int buttonIndex = id.end[-1] - '1';
+            iArray items;
+            init_Array(&items, sizeof(iMenuItem));
+            pushBack_Array(&items, &(iMenuItem){ "```${menu.toolbar.setaction}" });
+            for (size_t i = 0; i < max_ToolbarAction; i++) {
+                pushBack_Array(
+                    &items,
+                    &(iMenuItem){
+                        format_CStr(
+                            "%s %s", toolbarActions_Mobile[i].icon, toolbarActions_Mobile[i].label),
+                        0,
+                        0,
+                        format_CStr("navbar.action.set arg:%d button:%d", i, buttonIndex) });
+            }
+            openMenu_Widget(
+                makeMenu_Widget(get_Root()->widget, constData_Array(&items), size_Array(&items)),
+                coord_Command(cmd));
+            deinit_Array(&items);
+            return iTrue;
+        }
+        return iFalse;
+    }
     else if (equal_Command(cmd, "navigate.focus")) {
+        /* The upload dialog has its own path field. */
+        if (findWidget_App("upload")) {
+            postCommand_App("focus.set id:upload.path");
+            return iTrue;
+        }
         iWidget *url = findChild_Widget(navBar, "url");
         if (focus_Widget() != url) {
             setFocus_Widget(findChild_Widget(navBar, "url"));
@@ -710,6 +921,8 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     }
     else if (equal_Command(cmd, "navbar.clear")) {
         iInputWidget *url = findChild_Widget(navBar, "url");
+        setText_InputWidget(url, collectNew_String());
+#if 0
         selectAll_InputWidget(url);
         /* Emulate a Backspace keypress. */
         class_InputWidget(url)->processEvent(
@@ -718,6 +931,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                                                 .timestamp = SDL_GetTicks(),
                                                 .state     = SDL_PRESSED,
                                                 .keysym    = { .sym = SDLK_BACKSPACE } });
+#endif
         return iTrue;
     }
     else if (equal_Command(cmd, "navbar.cancel")) {
@@ -780,6 +994,26 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 dismissPortraitPhoneSidebars_Root(get_Root());
                 updateNavBarIdentity_(navBar);
                 updateNavDirButtons_(navBar);
+                /* Update site-specific used identities. */ {
+                    const iGmIdentity *ident =
+                        identityForUrl_GmCerts(certs_App(), url_DocumentWidget(document_App()));
+                    if (ident) {
+                        const iString *site =
+                            collectNewRange_String(urlRoot_String(canonicalUrl_String(urlStr)));
+                        const iStringArray *usedIdents =
+                            strings_SiteSpec(site, usedIdentities_SiteSpecKey);
+                        const iString *fingerprint = collect_String(hexEncode_Block(&ident->fingerprint));
+                        /* Keep this identity at the end of the list. */
+                        removeString_SiteSpec(site, usedIdentities_SiteSpecKey, fingerprint);
+                        insertString_SiteSpec(site, usedIdentities_SiteSpecKey, fingerprint);
+                        /* Keep the list short. */
+                        while (size_StringArray(usedIdents) > 5) {
+                            removeString_SiteSpec(site,
+                                                  usedIdentities_SiteSpecKey,
+                                                  constAt_StringArray(usedIdents, 0));
+                        }
+                    }
+                }
                 /* Icon updates should be limited to automatically chosen icons if the user
                    is allowed to pick their own in the future. */
                 if (updateBookmarkIcon_Bookmarks(bookmarks_App(), urlStr,
@@ -860,7 +1094,14 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
     else if (equal_Command(cmd, "focus.gained")) {
         if (pointer_Command(cmd) == findChild_Widget(searchBar, "find.input")) {
             if (!isVisible_Widget(searchBar)) {
+                /* InputWidget will unfocus itself if there isn't enough space for editing
+                   text. A collapsed widget will not have been arranged yet, so on the first
+                   time the widget will just be unfocused immediately. */
+                const iBool wasArranged = area_Rect(bounds_Widget(searchBar)) > 0;
                 showCollapsed_Widget(searchBar, iTrue);
+                if (!wasArranged) {
+                    postCommand_App("focus.set id:find.input");
+                }
             }
         }
     }
@@ -878,14 +1119,21 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
 }
 
 #if defined (iPlatformMobile)
-static void dismissSidebar_(iWidget *sidebar, const char *toolButtonId) {
-    if (isVisible_Widget(sidebar)) {
-        postCommandf_App("%s.toggle", cstr_String(id_Widget(sidebar)));
-//        if (toolButtonId) {
-            //            setFlags_Widget(findWidget_App(toolButtonId), noBackground_WidgetFlag, iTrue);
-//        }
-        setVisualOffset_Widget(sidebar, height_Widget(sidebar), 250, easeIn_AnimFlag);
+
+static void updateToolBarActions_(iWidget *toolBar) {
+    const iPrefs *prefs = prefs_App();
+    for (int i = 0; i < 2; i++) {
+        const int action = prefs->toolbarActions[i];
+        iLabelWidget *button =
+            findChild_Widget(toolBar, i == 0 ? "toolbar.action1" : "toolbar.action2");
+        if (button) {
+            setFlags_Widget(as_Widget(button), disabled_WidgetFlag, iFalse);
+            setOutline_LabelWidget(button, iFalse);
+            updateTextCStr_LabelWidget(button, toolbarActions_Mobile[action].icon);
+            setCommand_LabelWidget(button, collectNewCStr_String(toolbarActions_Mobile[action].command));
+        }
     }
+    refresh_Widget(toolBar);
 }
 
 static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
@@ -897,57 +1145,20 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "toolbar.showview")) {
-        /* TODO: Clean this up. */
-        iWidget *sidebar  = findWidget_App("sidebar");
-        iWidget *sidebar2 = findWidget_App("sidebar2");
-        dismissSidebar_(sidebar2, "toolbar.ident");
-        const iBool isVisible = isVisible_Widget(sidebar);
-        //        setFlags_Widget(findChild_Widget(toolBar, "toolbar.view"), noBackground_WidgetFlag,
-        //                        isVisible);
-        /* If a sidebar hasn't been shown yet, it's height is zero. */
-        const int viewHeight = size_Root(get_Root()).y;
         if (arg_Command(cmd) >= 0) {
             postCommandf_App("sidebar.mode arg:%d show:1", arg_Command(cmd));
-//            if (!isVisible) {
-//                setVisualOffset_Widget(sidebar, viewHeight, 0, 0);
-//                setVisualOffset_Widget(sidebar, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
-//            }
         }
         else {
             postCommandf_App("sidebar.toggle");
-//            if (isVisible) {
-//                setVisualOffset_Widget(sidebar, height_Widget(sidebar), 250, easeIn_AnimFlag);
-//            }
-//            else {
-//                setVisualOffset_Widget(sidebar, viewHeight, 0, 0);
-//                setVisualOffset_Widget(sidebar, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
-//            }
         }
         return iTrue;
     }
     else if (equal_Command(cmd, "toolbar.showident")) {
-        /* TODO: Clean this up. */
-        iWidget *sidebar  = findWidget_App("sidebar");
-        iWidget *sidebar2 = findWidget_App("sidebar2");
-        //dismissSidebar_(sidebar, "toolbar.view");
+        iWidget *sidebar = findWidget_App("sidebar");
         if (isVisible_Widget(sidebar)) {
             postCommandf_App("sidebar.toggle");
         }
-        const iBool isVisible = isVisible_Widget(sidebar2);
-        //        setFlags_Widget(findChild_Widget(toolBar, "toolbar.ident"), noBackground_WidgetFlag,
-        //                        isVisible);
-        /* If a sidebar hasn't been shown yet, it's height is zero. */
-        const int viewHeight = size_Root(get_Root()).y;
-        if (isVisible) {
-            dismissSidebar_(sidebar2, NULL);
-        }
-        else {
-            postCommand_App("sidebar2.mode arg:3 show:1");
-            int offset = height_Widget(sidebar2);
-            if (offset == 0) offset = size_Root(get_Root()).y;
-            setVisualOffset_Widget(sidebar2, offset, 0, 0);
-            setVisualOffset_Widget(sidebar2, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
-        }
+        postCommand_App("preferences idents:1");
         return iTrue;
     }
     else if (equal_Command(cmd, "sidebar.mode.changed")) {
@@ -955,8 +1166,13 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         updateTextCStr_LabelWidget(viewTool, icon_SidebarMode(arg_Command(cmd)));
         return iFalse;
     }
+    else if (equal_Command(cmd, "toolbar.actions.changed")) {
+        updateToolBarActions_(toolBar);
+        return iFalse;        
+    }
     return iFalse;
 }
+
 #endif /* defined (iPlatformMobile) */
 
 static iLabelWidget *newLargeIcon_LabelWidget(const char *text, const char *cmd) {
@@ -987,40 +1203,22 @@ void updateMetrics_Root(iRoot *d) {
         setFixedSize_Widget(appClose, appMin->rect.size);
         setFixedSize_Widget(appIcon, init_I2(appIconSize_Root(), appMin->rect.size.y));
     }
-    iWidget *navBar     = findChild_Widget(d->widget, "navbar");
-//    iWidget *lock       = findChild_Widget(navBar, "navbar.lock");
-    iWidget *url        = findChild_Widget(d->widget, "url");
-    iWidget *rightEmbed = findChild_Widget(navBar, "url.rightembed");
-    iWidget *embedPad   = findChild_Widget(navBar, "url.embedpad");
-    iWidget *urlButtons = findChild_Widget(navBar, "url.buttons");
+    iWidget      *navBar     = findChild_Widget(d->widget, "navbar");
+    iWidget      *url        = findChild_Widget(d->widget, "url");
+    iWidget      *rightEmbed = findChild_Widget(navBar, "url.rightembed");
+    iWidget      *embedPad   = findChild_Widget(navBar, "url.embedpad");
+    iWidget      *urlButtons = findChild_Widget(navBar, "url.buttons");
+    iLabelWidget *idName     = findChild_Widget(d->widget, "toolbar.name");
     setPadding_Widget(as_Widget(url), 0, gap_UI, 0, gap_UI);
-    navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */
-//    updateSize_LabelWidget((iLabelWidget *) lock);
-//    updateSize_LabelWidget((iLabelWidget *) findChild_Widget(navBar, "reload"));
-//    arrange_Widget(urlButtons);
+//    navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */
     setFixedSize_Widget(embedPad, init_I2(width_Widget(urlButtons) + gap_UI / 2, 1));
-//    setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75,
-//                                  width_Widget(lock) * 0.75);
     rightEmbed->rect.pos.y = gap_UI;
     updatePadding_Root(d);
     arrange_Widget(d->widget);
     updateUrlInputContentPadding_(navBar);
-    /* Position the toolbar identity name label manually. */ {
-        iLabelWidget *idName = findChild_Widget(d->widget, "toolbar.name");
-        if (idName) {
-            const iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
-            const iWidget *viewButton = findChild_Widget(d->widget, "toolbar.view");
-            const iWidget *idButton = findChild_Widget(toolBar, "toolbar.ident");
-            const int font = uiLabelTiny_FontId;
-            setFont_LabelWidget(idName, font);
-            setPos_Widget(as_Widget(idName),
-                          windowToLocal_Widget(as_Widget(idName),
-                                               init_I2(left_Rect(bounds_Widget(idButton)),
-                                                       bottom_Rect(bounds_Widget(viewButton)) -
-                                                           lineHeight_Text(font) - gap_UI / 2)));
-            setFixedSize_Widget(as_Widget(idName), init_I2(width_Widget(idButton),
-                                                           lineHeight_Text(font)));
-        }
+    if (idName) {
+        setFixedSize_Widget(as_Widget(idName),
+                            init_I2(-1, 2 * gap_UI + lineHeight_Text(uiLabelTiny_FontId)));
     }
     postRefresh_App();
 }
@@ -1044,11 +1242,9 @@ void createUserInterface_Root(iRoot *d) {
     setFlags_Widget(
         root, resizeChildren_WidgetFlag | fixedSize_WidgetFlag | focusRoot_WidgetFlag, iTrue);
     setCommandHandler_Widget(root, handleRootCommands_);
-
     iWidget *div = makeVDiv_Widget();
     setId_Widget(div, "navdiv");
     addChild_Widget(root, iClob(div));
-
 #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
     /* Window title bar. */
     if (prefs_App()->customFrame) {
@@ -1117,14 +1313,14 @@ void createUserInterface_Root(iRoot *d) {
         addUnsplitButton_(navBar);
 #endif
         iWidget *navBack;
-        setId_Widget(navBack = addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.back");
-        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(forwardArrow_Icon, 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.forward");
+        setId_Widget(navBack = addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.action1");
+        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(forwardArrow_Icon, 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.action2");
         /* Button for toggling the left sidebar. */
         setId_Widget(addChildFlags_Widget(
                          navBar,
                          iClob(newIcon_LabelWidget(leftHalf_Icon, 0, 0, "sidebar.toggle")),
                          collapse_WidgetFlag),
-                     "navbar.sidebar");
+                     "navbar.action3");
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         iInputWidget *url;
         /* URL input field. */ {
@@ -1245,22 +1441,25 @@ void createUserInterface_Root(iRoot *d) {
                         { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                         { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
                         { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
+                        { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" },
                         { "---" },
                         { "${menu.page.copyurl}", 0, 0, "document.copylink" },
                         { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
                         { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
-                    12);
+                    14);
                 setId_Widget(as_Widget(pageMenuButton), "pagemenubutton");
                 setFont_LabelWidget(pageMenuButton, uiContentBold_FontId);
                 setAlignVisually_LabelWidget(pageMenuButton, iTrue);
                 addChildFlags_Widget(urlButtons, iClob(pageMenuButton),
-                                     embedFlags | tight_WidgetFlag | collapse_WidgetFlag);
+                                     embedFlags | tight_WidgetFlag | collapse_WidgetFlag |
+                                     resizeToParentHeight_WidgetFlag);
                 updateSize_LabelWidget(pageMenuButton);
             }
             /* Reload button. */ {
                 iLabelWidget *reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
                 setId_Widget(as_Widget(reload), "reload");
-                addChildFlags_Widget(urlButtons, iClob(reload), embedFlags | collapse_WidgetFlag);
+                addChildFlags_Widget(urlButtons, iClob(reload), embedFlags | collapse_WidgetFlag |
+                                     resizeToParentHeight_WidgetFlag);
                 updateSize_LabelWidget(reload);
             }
             addChildFlags_Widget(as_Widget(url), iClob(urlButtons), moveToParentRightEdge_WidgetFlag);
@@ -1268,17 +1467,16 @@ void createUserInterface_Root(iRoot *d) {
             setId_Widget(addChild_Widget(rightEmbed, iClob(makePadding_Widget(0))), "url.embedpad");
         }
         /* The active identity menu. */ {
-            iLabelWidget *idMenu = makeMenuButton_LabelWidget(
-                "\U0001f464", identityButtonMenuItems_, iElemCount(identityButtonMenuItems_));
-            setAlignVisually_LabelWidget(idMenu, iTrue);
-            setId_Widget(addChildFlags_Widget(navBar, iClob(idMenu), collapse_WidgetFlag), "navbar.ident");
+            iLabelWidget *idButton = new_LabelWidget(person_Icon, "identmenu.open");
+            setAlignVisually_LabelWidget(idButton, iTrue);
+            setId_Widget(addChildFlags_Widget(navBar, iClob(idButton), collapse_WidgetFlag), "navbar.ident");
         }
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         setId_Widget(addChildFlags_Widget(navBar,
                                           iClob(newIcon_LabelWidget(
-                                              home_Icon, SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")),
+                                              home_Icon, 0, 0, "navigate.home")),
                                           collapse_WidgetFlag),
-                     "navbar.home");
+                     "navbar.action4");
 #if defined (iPlatformMobile)
         const iBool isPhone = (deviceType_App() == phone_AppDeviceType);
 #endif
@@ -1291,6 +1489,7 @@ void createUserInterface_Root(iRoot *d) {
         iLabelWidget *navMenu =
             makeMenuButton_LabelWidget(menu_Icon, navMenuItems_, iElemCount(navMenuItems_));
 #   endif
+        setCommand_LabelWidget(navMenu, collectNewCStr_String("menu.open under:1"));
         setAlignVisually_LabelWidget(navMenu, iTrue);
         setId_Widget(addChildFlags_Widget(navBar, iClob(navMenu), collapse_WidgetFlag), "navbar.menu");
 #endif
@@ -1322,17 +1521,18 @@ void createUserInterface_Root(iRoot *d) {
             "newtab");
     }
     /* Sidebars. */ {
-        iWidget *content = findChild_Widget(root, "tabs.content");
         iSidebarWidget *sidebar1 = new_SidebarWidget(left_SidebarSide);
-        addChildPos_Widget(content, iClob(sidebar1), front_WidgetAddPos);
-        iSidebarWidget *sidebar2 = new_SidebarWidget(right_SidebarSide);
         if (deviceType_App() != phone_AppDeviceType) {
+            /* Sidebars are next to the tab content. */
+            iWidget *content = findChild_Widget(root, "tabs.content");
+            addChildPos_Widget(content, iClob(sidebar1), front_WidgetAddPos);
+            iSidebarWidget *sidebar2 = new_SidebarWidget(right_SidebarSide);
             addChildPos_Widget(content, iClob(sidebar2), back_WidgetAddPos);
         }
         else {
-            /* The identities sidebar is always in the main area. */
-            addChild_Widget(findChild_Widget(root, "stack"), iClob(sidebar2));
-            setFlags_Widget(as_Widget(sidebar2), hidden_WidgetFlag, iTrue);
+            /* Sidebar is a slide-over sheet. */
+            addChild_Widget(root, iClob(sidebar1));
+            setFlags_Widget(as_Widget(sidebar1), hidden_WidgetFlag, iTrue);            
         }
     }
     /* Lookup results. */ {
@@ -1386,40 +1586,46 @@ void createUserInterface_Root(iRoot *d) {
                                      commandOnClick_WidgetFlag |
                                      drawBackgroundToBottom_WidgetFlag, iTrue);
         setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(newLargeIcon_LabelWidget(backArrow_Icon, "navigate.back")),
+                                          iClob(newLargeIcon_LabelWidget("", "...")),
                                           frameless_WidgetFlag),
-                     "toolbar.back");
+                     "toolbar.action1");
         setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(newLargeIcon_LabelWidget(forwardArrow_Icon, "navigate.forward")),
-                                          frameless_WidgetFlag),
-                     "toolbar.forward");
-        setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(newLargeIcon_LabelWidget("\U0001f464", "toolbar.showident")),
+                                          iClob(newLargeIcon_LabelWidget("", "...")),
                                           frameless_WidgetFlag),
+                     "toolbar.action2");
+        iWidget *identButton;
+        setId_Widget(identButton = addChildFlags_Widget(
+                         toolBar,
+                         iClob(newLargeIcon_LabelWidget("\U0001f464", "identmenu.open")),
+                         frameless_WidgetFlag | fixedHeight_WidgetFlag),
                      "toolbar.ident");
         setId_Widget(addChildFlags_Widget(toolBar,
                                           iClob(newLargeIcon_LabelWidget(book_Icon, "toolbar.showview arg:-1")),
                                           frameless_WidgetFlag | commandOnClick_WidgetFlag),
                      "toolbar.view");
-        setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(new_LabelWidget("", "toolbar.showident")),
+                     iLabelWidget *idName;
+        setId_Widget(addChildFlags_Widget(identButton,
+                                          iClob(idName = new_LabelWidget("", NULL)),
                                           frameless_WidgetFlag |
                                           noBackground_WidgetFlag |
-                                          fixedPosition_WidgetFlag |
+                                          moveToParentBottomEdge_WidgetFlag |
+                                          resizeToParentWidth_WidgetFlag
+                                          /*fixedPosition_WidgetFlag |
                                           fixedSize_WidgetFlag |
                                           ignoreForParentWidth_WidgetFlag |
-                                          ignoreForParentHeight_WidgetFlag),
+                                          ignoreForParentHeight_WidgetFlag*/),
                      "toolbar.name");
+        setFont_LabelWidget(idName, uiLabelTiny_FontId);
         iLabelWidget *menuButton = makeMenuButton_LabelWidget(menu_Icon, phoneNavMenuItems_,
                                                               iElemCount(phoneNavMenuItems_));
         setFont_LabelWidget(menuButton, uiLabelLarge_FontId);
         setId_Widget(as_Widget(menuButton), "toolbar.navmenu");
         addChildFlags_Widget(toolBar, iClob(menuButton), frameless_WidgetFlag);
         iForEach(ObjectList, i, children_Widget(toolBar)) {
-            iLabelWidget *btn = i.object;
             setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue);
         }
         updateToolbarColors_Root(d);
+        updateToolBarActions_(toolBar);
         const iMenuItem items[] = {
             { book_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" },
             { star_Icon " ${sidebar.feeds}", 0, 0, "toolbar.showview arg:1" },
@@ -1431,6 +1637,7 @@ void createUserInterface_Root(iRoot *d) {
         setId_Widget(menu, "toolbar.menu"); /* view menu */
     }
 #endif
+    updateNavBarActions_(navBar);
     updatePadding_Root(d);
     /* Global context menus. */ {
         iWidget *tabsMenu = makeMenu_Widget(
@@ -1474,6 +1681,12 @@ void createUserInterface_Root(iRoot *d) {
                 { select_Icon " ${menu.selectall}", 0, 0, "input.selectall" },
             }, 8);
 #endif
+        if (deviceType_App() == phone_AppDeviceType) {
+            /* Small screen; conserve space by removing the Cancel item. */
+            iRelease(removeChild_Widget(clipMenu, lastChild_Widget(clipMenu)));
+            iRelease(removeChild_Widget(clipMenu, lastChild_Widget(clipMenu)));
+            iRelease(removeChild_Widget(clipMenu, lastChild_Widget(clipMenu)));
+        }
         iWidget *splitMenu = makeMenu_Widget(root, (iMenuItem[]){
             { "${menu.split.merge}", '1', 0, "ui.split arg:0" },
             { "${menu.split.swap}", SDLK_x, 0, "ui.split swap:1" },
@@ -1493,6 +1706,7 @@ void createUserInterface_Root(iRoot *d) {
         setId_Widget(splitMenu, "splitmenu");
     }
     /* Global keyboard shortcuts. */ {
+        addAction_Widget(root, SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home");
         addAction_Widget(root, 'l', KMOD_PRIMARY, "navigate.focus");
         addAction_Widget(root, 'f', KMOD_PRIMARY, "focus.set id:find.input");
         addAction_Widget(root, '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1");
@@ -1558,9 +1772,10 @@ iRect safeRect_Root(const iRoot *d) {
 
 iRect visibleRect_Root(const iRoot *d) {
     iRect visRect = rect_Root(d);
+    float bottom = 0.0f;
 #if defined (iPlatformAppleMobile)
     /* TODO: Check this on device... Maybe DisplayUsableBounds would be good here, too? */
-    float left, top, right, bottom;
+    float left, top, right;
     safeAreaInsets_iOS(&left, &top, &right, &bottom);
     visRect.pos.x = (int) left;
     visRect.size.x -= (int) (left + right);
@@ -1585,6 +1800,6 @@ iRect visibleRect_Root(const iRoot *d) {
         visRect = intersect_Rect(visRect, init_Rect(usable.x, usable.y, usable.w, usable.h));        
     }
 #endif
-    adjustEdges_Rect(&visRect, 0, 0, -get_MainWindow()->keyboardHeight, 0);
+    adjustEdges_Rect(&visRect, 0, 0, -get_MainWindow()->keyboardHeight + bottom, 0);
     return visRect;
 }
diff --git a/src/ui/root.h b/src/ui/root.h
index 851d927d..7e831be3 100644
--- a/src/ui/root.h
+++ b/src/ui/root.h
@@ -2,11 +2,15 @@
 
 #include "widget.h"
 #include "color.h"
+#include <the_Foundation/audience.h>
 #include <the_Foundation/ptrset.h>
 #include <the_Foundation/vec2.h>
 
 iDeclareType(Root)
 
+iDeclareNotifyFunc(Root, VisualOffsetsChanged)
+iDeclareAudienceGetter(Root, visualOffsetsChanged)
+
 struct Impl_Root {
     iWidget *  widget;
     iWindow *  window;
@@ -14,6 +18,9 @@ struct Impl_Root {
     iPtrSet *  pendingDestruction;
     iBool      pendingArrange;
     int        loadAnimTimer;
+    iBool      didAnimateVisualOffsets;
+    iBool      didChangeArrangement;
+    iAudience *visualOffsetsChanged; /* called after running tickers */
     iColor     tmPalette[tmMax_ColorId]; /* theme-specific palette */
 };
 
@@ -36,6 +43,7 @@ void        updatePadding_Root                  (iRoot *); /* TODO: is part of m
 void        dismissPortraitPhoneSidebars_Root   (iRoot *);
 void        showToolbar_Root                    (iRoot *, iBool show);
 void        updateToolbarColors_Root            (iRoot *);
+void        notifyVisualOffsetChange_Root       (iRoot *);
 
 iInt2       size_Root                           (const iRoot *);
 iRect       rect_Root                           (const iRoot *);
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index b6f73b6c..651669c6 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -107,7 +107,7 @@ static iRect bounds_ScrollWidget_(const iScrollWidget *d) {
 static iRect thumbRect_ScrollWidget_(const iScrollWidget *d) {
     const iRect bounds = bounds_ScrollWidget_(d);
     iRect rect = init_Rect(bounds.pos.x, bounds.pos.y, bounds.size.x, 0);
-    const int total = size_Range(&d->range);
+    const int total = (int) size_Range(&d->range);
     if (total > 0) {
         const int tsize = thumbSize_ScrollWidget_(d);
 //        iAssert(tsize <= height_Rect(bounds));
@@ -197,7 +197,7 @@ static iBool processEvent_ScrollWidget_(iScrollWidget *d, const SDL_Event *ev) {
         case drag_ClickResult: {
             const iRect bounds = bounds_ScrollWidget_(d);
             const int offset = delta_Click(&d->click).y;
-            const int total = size_Range(&d->range);
+            const int total = (int) size_Range(&d->range);
             int dpos = (float) offset / (float) (height_Rect(bounds) - thumbSize_ScrollWidget_(d)) * total;
             d->thumb = iClamp(d->startThumb + dpos, d->range.start, d->range.end);
             postCommand_Widget(w, "scroll.moved arg:%d", d->thumb);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 2219eba9..16677f9e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 #include "defs.h"
 #include "bookmarks.h"
+#include "certlistwidget.h"
 #include "command.h"
 #include "documentwidget.h"
 #include "feeds.h"
@@ -34,10 +35,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "inputwidget.h"
 #include "labelwidget.h"
 #include "listwidget.h"
+#include "mobile.h"
 #include "keys.h"
 #include "paint.h"
 #include "root.h"
 #include "scrollwidget.h"
+#include "touch.h"
 #include "util.h"
 #include "visited.h"
 
@@ -88,6 +91,22 @@ iDefineObjectConstruction(SidebarItem)
 
 /*----------------------------------------------------------------------------------------------*/
 
+static const char *normalModeLabels_[max_SidebarMode] = {
+    book_Icon   " ${sidebar.bookmarks}",
+    star_Icon   " ${sidebar.feeds}",
+    clock_Icon  " ${sidebar.history}",
+    person_Icon " ${sidebar.identities}",
+    page_Icon   " ${sidebar.outline}",
+};
+
+static const char *tightModeLabels_[max_SidebarMode] = {
+    book_Icon,
+    star_Icon,
+    clock_Icon,
+    person_Icon,
+    page_Icon,
+};
+
 struct Impl_SidebarWidget {
     iWidget           widget;
     enum iSidebarSide side;
@@ -96,7 +115,10 @@ struct Impl_SidebarWidget {
     iString           cmdPrefix;
     iWidget *         blank;
     iListWidget *     list;
+    iCertListWidget * certList;
     iWidget *         actions; /* below the list, area for buttons */
+    int               midHeight; /* on portrait phone, the height for the middle state */
+    iBool             isEditing; /* mobile edit mode */
     int               modeScroll[max_SidebarMode];
     iLabelWidget *    modeButtons[max_SidebarMode];
     int               maxButtonLabelWidth;
@@ -114,6 +136,10 @@ struct Impl_SidebarWidget {
 
 iDefineObjectConstructionArgs(SidebarWidget, (enum iSidebarSide side), side)
 
+iLocalDef iListWidget *list_SidebarWidget_(iSidebarWidget *d) {
+    return d->mode == identities_SidebarMode ? (iListWidget *) d->certList : d->list;
+}
+
 static iBool isResizing_SidebarWidget_(const iSidebarWidget *d) {
     return (flags_Widget(d->resizer) & pressed_WidgetFlag) != 0;
 }
@@ -181,77 +207,31 @@ int cmpTree_Bookmark(const iBookmark **a, const iBookmark **b) {
     return cmpStringCase_String(&bm1->title, &bm2->title);
 }
 
+static enum iFontId actionButtonFont_SidebarWidget_(const iSidebarWidget *d) {
+    switch (deviceType_App()) {
+        default:
+            break;
+        case phone_AppDeviceType:
+            return isPortrait_App() ? uiLabelBig_FontId : uiLabelMedium_FontId;
+        case tablet_AppDeviceType:
+            return uiLabelMedium_FontId;
+    }
+    return d->buttonFont;
+}
+
 static iLabelWidget *addActionButton_SidebarWidget_(iSidebarWidget *d, const char *label,
                                                     const char *command, int64_t flags) {
     iLabelWidget *btn = addChildFlags_Widget(d->actions,
                                              iClob(new_LabelWidget(label, command)),
-                                             //(deviceType_App() != desktop_AppDeviceType ?
-                                             // extraPadding_WidgetFlag : 0) |
                                              flags);
-    setFont_LabelWidget(btn, deviceType_App() == phone_AppDeviceType && d->side == right_SidebarSide
-                                 ? uiLabelBig_FontId
-                                 : d->buttonFont);
+    setFont_LabelWidget(btn, actionButtonFont_SidebarWidget_(d));
     checkIcon_LabelWidget(btn);
-    return btn;
-}
-
-static iGmIdentity *menuIdentity_SidebarWidget_(const iSidebarWidget *d) {
-    if (d->mode == identities_SidebarMode) {
-        if (d->contextItem) {
-            return identity_GmCerts(certs_App(), d->contextItem->id);
-        }
-    }
-    return NULL;
-}
-
-static void updateContextMenu_SidebarWidget_(iSidebarWidget *d) {
-    if (d->mode != identities_SidebarMode) {
-        return;
+    if (deviceType_App() != desktop_AppDeviceType) {
+        setFlags_Widget(as_Widget(btn), frameless_WidgetFlag, iTrue);
+        setTextColor_LabelWidget(btn, uiTextAction_ColorId);
+        setBackgroundColor_Widget(as_Widget(btn), uiBackground_ColorId);
     }
-    iArray *items = collectNew_Array(sizeof(iMenuItem));
-    pushBackN_Array(items, (iMenuItem[]){
-        { person_Icon " ${ident.use}", 0, 0, "ident.use arg:1" },
-        { close_Icon " ${ident.stopuse}", 0, 0, "ident.use arg:0" },
-        { close_Icon " ${ident.stopuse.all}", 0, 0, "ident.use arg:0 clear:1" },
-        { "---", 0, 0, NULL },
-        { edit_Icon " ${menu.edit.notes}", 0, 0, "ident.edit" },
-        { "${ident.fingerprint}", 0, 0, "ident.fingerprint" },
-        { export_Icon " ${ident.export}", 0, 0, "ident.export" },
-        { "---", 0, 0, NULL },
-        { delete_Icon " " uiTextCaution_ColorEscape "${ident.delete}", 0, 0, "ident.delete confirm:1" },
-    }, 9);
-    /* Used URLs. */
-    const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
-    if (ident) {
-        size_t insertPos = 3;
-        if (!isEmpty_StringSet(ident->useUrls)) {
-            insert_Array(items, insertPos++, &(iMenuItem){ "---", 0, 0, NULL });
-        }
-        const iString *docUrl = url_DocumentWidget(document_App());
-        iBool usedOnCurrentPage = iFalse;
-        iConstForEach(StringSet, i, ident->useUrls) {            
-            const iString *url = i.value;
-            usedOnCurrentPage |= equalCase_String(docUrl, url);
-            iRangecc urlStr = range_String(url);
-            if (startsWith_Rangecc(urlStr, "gemini://")) {
-                urlStr.start += 9; /* omit the default scheme */
-            }
-            if (endsWith_Rangecc(urlStr, "/")) {
-                urlStr.end--; /* looks cleaner */
-            }
-            insert_Array(items,
-                         insertPos++,
-                         &(iMenuItem){ format_CStr(globe_Icon " %s", cstr_Rangecc(urlStr)),
-                                       0,
-                                       0,
-                                       format_CStr("!open url:%s", cstr_String(url)) });
-        }
-        if (!usedOnCurrentPage) {
-            remove_Array(items, 1);
-        }
-    }
-    destroy_Widget(d->menu);    
-    d->menu = makeMenu_Widget(as_Widget(d), data_Array(items), size_Array(items));    
+    return btn;
 }
 
 static iBool isBookmarkFolded_SidebarWidget_(const iSidebarWidget *d, const iBookmark *bm) {
@@ -264,11 +244,29 @@ static iBool isBookmarkFolded_SidebarWidget_(const iSidebarWidget *d, const iBoo
     return iFalse;
 }
 
+static iBool isSlidingSheet_SidebarWidget_(const iSidebarWidget *d) {
+    return isPortraitPhone_App();
+}
+
+static void setMobileEditMode_SidebarWidget_(iSidebarWidget *d, iBool editing) {
+    iWidget *w = as_Widget(d);
+    d->isEditing = editing;
+    if (d->actions) {
+        setFlags_Widget(findChild_Widget(w, "sidebar.close"), hidden_WidgetFlag, editing);
+        setFlags_Widget(child_Widget(d->actions, 0), hidden_WidgetFlag, !editing);
+        setTextCStr_LabelWidget(child_Widget(as_Widget(d->actions), 2),
+                                editing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}");
+        setDragHandleWidth_ListWidget(d->list, editing ? itemHeight_ListWidget(d->list) * 3 / 2 : 0);
+        arrange_Widget(d->actions);
+    }
+}
+
 static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepActions) {
+    const iBool isMobile = (deviceType_App() != desktop_AppDeviceType);
     clear_ListWidget(d->list);
     releaseChildren_Widget(d->blank);
     if (!keepActions) {
-    releaseChildren_Widget(d->actions);
+        releaseChildren_Widget(d->actions);
     }
     d->actions->rect.size.y = 0;
     destroy_Widget(d->menu);
@@ -288,7 +286,8 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
             iZap(on);
             size_t numItems = 0;
             isEmpty = iTrue;
-            iConstForEach(PtrArray, i, listEntries_Feeds()) {
+            const iPtrArray *feedEntries = listEntries_Feeds();
+            iConstForEach(PtrArray, i, feedEntries) {
                 const iFeedEntry *entry = i.ptr;
                 if (isHidden_FeedEntry(entry)) {
                     continue; /* A hidden entry. */
@@ -301,12 +300,12 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 if (secondsSince_Time(&now, &entry->discovered) > maxAge_Visited) {
                     break; /* the rest are even older */
                 }
-                isEmpty = iFalse;
                 const iBool isOpen = equal_String(docUrl, &entry->url);
                 const iBool isUnread = isUnread_FeedEntry(entry);
                 if (d->feedsMode == unread_FeedsMode && !isUnread && !isOpen) {
                     continue;
                 }
+                isEmpty = iFalse;
                 /* Insert date separators. */ {
                     iDate entryDate;
                     init_Date(&entryDate, &entry->posted);
@@ -351,34 +350,67 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 }
             }
             /* Actions. */
-            if (!keepActions) {
-                addActionButton_SidebarWidget_(
-                    d, check_Icon " ${sidebar.action.feeds.markallread}", "feeds.markallread", expand_WidgetFlag |
-                    tight_WidgetFlag);
-                updateSize_LabelWidget(addChildFlags_Widget(d->actions,
-                                     iClob(new_LabelWidget("${sidebar.action.show}", NULL)),
-                                                            frameless_WidgetFlag | tight_WidgetFlag));
-                const iMenuItem items[] = {
-                    { "${sidebar.action.feeds.showall}", SDLK_u, KMOD_SHIFT, "feeds.mode arg:0" },
-                    { "${sidebar.action.feeds.showunread}", SDLK_u, 0, "feeds.mode arg:1" },
-                };
-                iWidget *dropButton = addChild_Widget(
-                    d->actions,
-                    iClob(makeMenuButton_LabelWidget(items[d->feedsMode].label, items, 2)));
-                setId_Widget(dropButton, "feeds.modebutton");
-                checkIcon_LabelWidget((iLabelWidget *) dropButton);
-                setFixedSize_Widget(
-                    dropButton,
-                    init_I2(iMaxi(20 * gap_UI, measure_Text(
-                                default_FontId,
-                                translateCStr_Lang(items[findWidestLabel_MenuItem(items, 2)].label))
-                                    .advance.x +
-                                                   6 * gap_UI),
+            if (!isMobile) {
+                if (!keepActions && !isEmpty_PtrArray(feedEntries)) {
+                    addActionButton_SidebarWidget_(d,
+                                                   check_Icon
+                                                   " ${sidebar.action.feeds.markallread}",
+                                                   "feeds.markallread",
+                                                   expand_WidgetFlag | tight_WidgetFlag);
+                    updateSize_LabelWidget(
+                        addChildFlags_Widget(d->actions,
+                                             iClob(new_LabelWidget("${sidebar.action.show}", NULL)),
+                                             frameless_WidgetFlag | tight_WidgetFlag));
+                    const iMenuItem items[] = {
+                        { page_Icon " ${sidebar.action.feeds.showall}",
+                          SDLK_u,
+                          KMOD_SHIFT,
+                          "feeds.mode arg:0" },
+                        { circle_Icon " ${sidebar.action.feeds.showunread}",
+                          SDLK_u,
+                          0,
+                          "feeds.mode arg:1" },
+                    };
+                    iWidget *dropButton = addChild_Widget(
+                        d->actions,
+                        iClob(makeMenuButton_LabelWidget(items[d->feedsMode].label, items, 2)));
+                    setId_Widget(dropButton, "feeds.modebutton");
+                    checkIcon_LabelWidget((iLabelWidget *) dropButton);
+                    setFixedSize_Widget(
+                        dropButton,
+                        init_I2(
+                            iMaxi(20 * gap_UI,
+                                  measure_Text(default_FontId,
+                                               translateCStr_Lang(
+                                                   items[findWidestLabel_MenuItem(items, 2)].label))
+                                          .advance.x +
+                                      13 * gap_UI),
                             -1));
+                }
+                else {
+                    updateDropdownSelection_LabelWidget(
+                        findChild_Widget(d->actions, "feeds.modebutton"),
+                        format_CStr(" arg:%d", d->feedsMode));
+                }
             }
             else {
-                updateDropdownSelection_LabelWidget(findChild_Widget(d->actions, "feeds.modebutton"),
-                                                    format_CStr(" arg:%d", d->feedsMode));
+                if (!keepActions) {
+                    iLabelWidget *readAll = addActionButton_SidebarWidget_(d,
+                                                   check_Icon,
+                                                   "feeds.markallread confirm:1",
+                                                   0);
+                    setTextColor_LabelWidget(readAll, uiTextCaution_ColorId);
+                    addActionButton_SidebarWidget_(d,
+                                                   page_Icon,
+                                                   "feeds.mode arg:0",
+                                                   0);
+                    addActionButton_SidebarWidget_(d,
+                                                   circle_Icon,
+                                                   "feeds.mode arg:1",
+                                                   0);
+                }
+                setOutline_LabelWidget(child_Widget(d->actions, 1), d->feedsMode != all_FeedsMode);
+                setOutline_LabelWidget(child_Widget(d->actions, 2), d->feedsMode != unread_FeedsMode);
             }
             d->menu = makeMenu_Widget(
                 as_Widget(d),
@@ -416,11 +448,6 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
             break;
         }
         case bookmarks_SidebarMode: {
-            iRegExp *homeTag         = iClob(new_RegExp("\\b" homepage_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *subTag          = iClob(new_RegExp("\\b" subscribed_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *remoteSourceTag = iClob(new_RegExp("\\b" remoteSource_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *remoteTag       = iClob(new_RegExp("\\b" remote_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *linkSplitTag    = iClob(new_RegExp("\\b" linkSplit_BookmarkTag "\\b", caseSensitive_RegExpOption));
             iConstForEach(PtrArray, i, list_Bookmarks(bookmarks_App(), cmpTree_Bookmark, NULL, NULL)) {
                 const iBookmark *bm = i.ptr;
                 if (isBookmarkFolded_SidebarWidget_(d, bm)) {
@@ -439,27 +466,21 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 }
                 set_String(&item->url, &bm->url);
                 set_String(&item->label, &bm->title);
-                /* Icons for special tags. */ {
-                    iRegExpMatch m;
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(subTag, &bm->tags, &m)) {
+                /* Icons for special behaviors. */ {
+                    if (bm->flags & subscribed_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x2605);
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(homeTag, &bm->tags, &m)) {
+                    if (bm->flags & homepage_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x1f3e0);
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(remoteTag, &bm->tags, &m)) {
+                    if (bm->flags & remote_BookmarkFlag) { 
                         item->listItem.isDraggable = iFalse;
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(remoteSourceTag, &bm->tags, &m)) {
+                    if (bm->flags & remoteSource_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x2913);
                         item->isBold = iTrue;
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(linkSplitTag, &bm->tags, &m)) {
+                    if (bm->flags & linkSplit_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x25e7);
                     }
                 }
@@ -495,6 +516,14 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                                { "---", 0, 0, NULL },
                                { reload_Icon " ${bookmarks.reload}", 0, 0, "bookmarks.reload.remote" } },               
                 6);
+            if (isMobile) {
+                addActionButton_SidebarWidget_(d, "${sidebar.action.bookmarks.newfolder}",
+                                               "bookmarks.addfolder", !d->isEditing ? hidden_WidgetFlag : 0);
+                addChildFlags_Widget(d->actions, iClob(new_Widget()), expand_WidgetFlag);
+                iLabelWidget *btn = addActionButton_SidebarWidget_(d,
+                    d->isEditing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}",
+                    "sidebar.bookmarks.edit", 0);
+            }
             break;
         }
         case history_SidebarMode: {
@@ -554,49 +583,15 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
                 (iMenuItem[]){
                     { delete_Icon " " uiTextCaution_ColorEscape "${history.clear}", 0, 0, "history.clear confirm:1" },
                 }, 1);
+            if (isMobile) {
+                addChildFlags_Widget(d->actions, iClob(new_Widget()), expand_WidgetFlag);
+                iLabelWidget *btn = addActionButton_SidebarWidget_(d, "${sidebar.action.history.clear}",
+                                                                   "history.clear confirm:1", 0);
+            }
             break;
         }
         case identities_SidebarMode: {
-            const iString *tabUrl = url_DocumentWidget(document_App());
-            const iRangecc tabHost = urlHost_String(tabUrl);
-            isEmpty = iTrue;
-            iConstForEach(PtrArray, i, identities_GmCerts(certs_App())) {
-                const iGmIdentity *ident = i.ptr;
-                iSidebarItem *item = new_SidebarItem();
-                item->id = (uint32_t) index_PtrArrayConstIterator(&i);
-                item->icon = 0x1f464; /* person */
-                set_String(&item->label, name_GmIdentity(ident));
-                iDate until;
-                validUntil_TlsCertificate(ident->cert, &until);
-                const iBool isActive = isUsedOn_GmIdentity(ident, tabUrl);
-                format_String(&item->meta,
-                              "%s",
-                              isActive ? cstr_Lang("ident.using")
-                              : isUsed_GmIdentity(ident)
-                                  ? formatCStrs_Lang("ident.usedonurls.n", size_StringSet(ident->useUrls))
-                                  : cstr_Lang("ident.notused"));
-                const char *expiry =
-                    ident->flags & temporary_GmIdentityFlag
-                        ? cstr_Lang("ident.temporary")
-                        : cstrCollect_String(format_Date(&until, cstr_Lang("ident.expiry")));
-                if (isEmpty_String(&ident->notes)) {
-                    appendFormat_String(&item->meta, "\n%s", expiry);
-                }
-                else {
-                    appendFormat_String(&item->meta,
-                                        " \u2014 %s\n%s%s",
-                                        expiry,
-                                        escape_Color(uiHeading_ColorId),
-                                        cstr_String(&ident->notes));
-                }
-                item->listItem.isSelected = isActive;
-                if (isUsedOnDomain_GmIdentity(ident, tabHost)) {
-                    item->indent = 1; /* will be highlighted */
-                }
-                addItem_ListWidget(d->list, item);
-                iRelease(item);
-                isEmpty = iFalse;
-            }
+            isEmpty = !updateItems_CertListWidget(d->certList);
             /* Actions. */
             if (!isEmpty) {
                 addActionButton_SidebarWidget_(d, add_Icon " ${sidebar.action.ident.new}", "ident.new", 0);
@@ -607,16 +602,27 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
         default:
             break;
     }
-    scrollOffset_ListWidget(d->list, 0);
-    updateVisible_ListWidget(d->list);
-    invalidate_ListWidget(d->list);
+    setFlags_Widget(as_Widget(d->list), hidden_WidgetFlag, d->mode == identities_SidebarMode);
+    setFlags_Widget(as_Widget(d->certList), hidden_WidgetFlag, d->mode != identities_SidebarMode);    
+    scrollOffset_ListWidget(list_SidebarWidget_(d), 0);
+    updateVisible_ListWidget(list_SidebarWidget_(d));
+    invalidate_ListWidget(list_SidebarWidget_(d));
     /* Content for a blank tab. */
     if (isEmpty) {
         if (d->mode == feeds_SidebarMode) {
             iWidget *div = makeVDiv_Widget();
             setPadding_Widget(div, 3 * gap_UI, 0, 3 * gap_UI, 2 * gap_UI);
+            arrange_Widget(d->actions);
+//            setPadding_Widget(div, 0, 0, 0, height_Widget(d->actions));
             addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag); /* pad */
-            addChild_Widget(div, iClob(new_LabelWidget("${menu.feeds.refresh}", "feeds.refresh")));
+            if (d->feedsMode == all_FeedsMode) {
+                addChild_Widget(div, iClob(new_LabelWidget("${menu.feeds.refresh}", "feeds.refresh")));
+            }
+            else {
+                iLabelWidget *msg = addChildFlags_Widget(div, iClob(new_LabelWidget("${sidebar.empty.unread}", NULL)),
+                                                         frameless_WidgetFlag);
+                setFont_LabelWidget(msg, uiLabelLarge_FontId);
+            }
             addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag); /* pad */
             addChild_Widget(d->blank, iClob(div));
         }
@@ -645,7 +651,7 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
             setWrap_LabelWidget(linkLabel, iTrue);
             addChild_Widget(d->blank, iClob(div));
         }
-//        arrange_Widget(d->blank);
+        arrange_Widget(d->blank);
     }
 #if 0
     if (deviceType_App() != desktop_AppDeviceType) {
@@ -659,7 +665,7 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
 #endif
     arrange_Widget(d->actions);
     arrange_Widget(as_Widget(d));
-    updateMouseHover_ListWidget(d->list);
+    updateMouseHover_ListWidget(list_SidebarWidget_(d));
 }
 
 static void updateItems_SidebarWidget_(iSidebarWidget *d) {
@@ -678,35 +684,59 @@ static size_t findItem_SidebarWidget_(const iSidebarWidget *d, int id) {
 }
 
 static void updateItemHeight_SidebarWidget_(iSidebarWidget *d) {
+    const float heights[max_SidebarMode] = { 1.333f, 2.333f, 1.333f, 3.5f, 1.2f };
     if (d->list) {
-        const float heights[max_SidebarMode] = { 1.333f, 2.333f, 1.333f, 3.5f, 1.2f };
         setItemHeight_ListWidget(d->list, heights[d->mode] * lineHeight_Text(d->itemFonts[0]));
     }
+    if (d->certList) {
+        updateItemHeight_CertListWidget(d->certList);
+    }
 }
 
 iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
     if (d->mode == mode) {
         return iFalse;
     }
+    if (mode == identities_SidebarMode && deviceType_App() != desktop_AppDeviceType) {
+        return iFalse; /* Identities are in Settings. */
+    }
     if (d->mode >= 0 && d->mode < max_SidebarMode) {
-        d->modeScroll[d->mode] = scrollPos_ListWidget(d->list); /* saved for later */
+        d->modeScroll[d->mode] = scrollPos_ListWidget(list_SidebarWidget_(d)); /* saved for later */
     }
     d->mode = mode;
     for (enum iSidebarMode i = 0; i < max_SidebarMode; i++) {
         setFlags_Widget(as_Widget(d->modeButtons[i]), selected_WidgetFlag, i == d->mode);
     }
-    setBackgroundColor_Widget(as_Widget(d->list),
+    setBackgroundColor_Widget(as_Widget(list_SidebarWidget_(d)),
                               d->mode == documentOutline_SidebarMode ? tmBannerBackground_ColorId
                                                                      : uiBackgroundSidebar_ColorId);
     updateItemHeight_SidebarWidget_(d);
+    if (deviceType_App() != desktop_AppDeviceType && mode != bookmarks_SidebarMode) {
+        setMobileEditMode_SidebarWidget_(d, iFalse);
+    }
     /* Restore previous scroll position. */
-    setScrollPos_ListWidget(d->list, d->modeScroll[mode]);
+    setScrollPos_ListWidget(list_SidebarWidget_(d), d->modeScroll[mode]);
+    /* Title of the mobile sliding sheet. */
+    iLabelWidget *sheetTitle = findChild_Widget(&d->widget, "sidebar.title");
+    if (sheetTitle) {
+        iString title;
+        initCStr_String(&title, normalModeLabels_[d->mode]);
+        removeIconPrefix_String(&title);
+        setText_LabelWidget(sheetTitle, &title);
+        deinit_String(&title);
+    }
     return iTrue;
 }
 
 void setClosedFolders_SidebarWidget(iSidebarWidget *d, const iIntSet *closedFolders) {
+    if (d) {
     delete_IntSet(d->closedFolders);
     d->closedFolders = copy_IntSet(closedFolders);
+    }
+}
+
+void setMidHeight_SidebarWidget(iSidebarWidget *d, int midHeight) {
+    d->midHeight = midHeight;
 }
 
 enum iSidebarMode mode_SidebarWidget(const iSidebarWidget *d) {
@@ -722,25 +752,9 @@ float width_SidebarWidget(const iSidebarWidget *d) {
 }
 
 const iIntSet *closedFolders_SidebarWidget(const iSidebarWidget *d) {
-    return d->closedFolders;
+    return d ? d->closedFolders : collect_IntSet(new_IntSet());
 }
 
-static const char *normalModeLabels_[max_SidebarMode] = {
-    book_Icon   " ${sidebar.bookmarks}",
-    star_Icon   " ${sidebar.feeds}",
-    clock_Icon  " ${sidebar.history}",
-    person_Icon " ${sidebar.identities}",
-    page_Icon   " ${sidebar.outline}",
-};
-
-static const char *tightModeLabels_[max_SidebarMode] = {
-    book_Icon,
-    star_Icon,
-    clock_Icon,
-    person_Icon,
-    page_Icon,
-};
-
 const char *icon_SidebarMode(enum iSidebarMode mode) {
     return tightModeLabels_[mode];
 }
@@ -762,6 +776,20 @@ static void updateMetrics_SidebarWidget_(iSidebarWidget *d) {
     updateItemHeight_SidebarWidget_(d);
 }
 
+static void updateSlidingSheetHeight_SidebarWidget_(iSidebarWidget *sidebar, iRoot *root) {
+    if (!isPortraitPhone_App() || !isVisible_Widget(sidebar)) return;
+    iWidget *d = as_Widget(sidebar);
+    const int oldSize = d->rect.size.y;
+    const int newSize = bottom_Rect(safeRect_Root(d->root)) - top_Rect(bounds_Widget(d));
+    if (oldSize != newSize) {
+        d->rect.size.y = newSize;
+        arrange_Widget(d);
+    }
+//    printf("[%p] %u: %d  animating %d\n", d, window_Widget(d)->frameTime,
+//           (flags_Widget(d) & visualOffset_WidgetFlag) != 0,
+//           newSize);
+}
+
 void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
@@ -778,6 +806,8 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->side = side;
     d->mode = -1;
     d->feedsMode = all_FeedsMode;
+    d->midHeight = 0;
+    d->isEditing = iFalse;
     d->numUnreadEntries = 0;
     d->buttonFont = uiLabel_FontId; /* wiil be changed later */
     d->itemFonts[0] = uiContent_FontId;
@@ -795,18 +825,38 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     iWidget *vdiv = makeVDiv_Widget();
     addChildFlags_Widget(w, vdiv, resizeToParentWidth_WidgetFlag | resizeToParentHeight_WidgetFlag);
     iZap(d->modeButtons);
-    d->resizer = NULL;
-    d->list = NULL;
-    d->actions = NULL;
+    d->resizer       = NULL;
+    d->list          = NULL;
+    d->certList      = NULL;
+    d->actions       = NULL;
     d->closedFolders = new_IntSet();
-    /* On a phone, the right sidebar is used exclusively for Identities. */
-    const iBool isPhone = deviceType_App() == phone_AppDeviceType;
-    if (!isPhone || d->side == left_SidebarSide) {
+    /* On a phone, the right sidebar is not used. */
+    const iBool isPhone = (deviceType_App() == phone_AppDeviceType);
+    if (isPhone) {
+        iLabelWidget *sheetTitle =
+            addChildFlags_Widget(vdiv,
+                                 iClob(new_LabelWidget("", NULL)),
+                                 collapse_WidgetFlag |
+                                 extraPadding_WidgetFlag | frameless_WidgetFlag);
+        setBackgroundColor_Widget(as_Widget(sheetTitle), uiBackground_ColorId);
+        iLabelWidget *closeButton = addChildFlags_Widget(as_Widget(sheetTitle),
+                                                  iClob(new_LabelWidget(uiTextAction_ColorEscape "${sidebar.close}", "sidebar.toggle")),
+                                                  extraPadding_WidgetFlag | frameless_WidgetFlag |
+                                                  alignRight_WidgetFlag | moveToParentRightEdge_WidgetFlag);
+        as_Widget(sheetTitle)->flags2 |= slidingSheetDraggable_WidgetFlag2; /* phone */
+        as_Widget(closeButton)->flags2 |= slidingSheetDraggable_WidgetFlag2; /* phone */
+        setId_Widget(as_Widget(sheetTitle), "sidebar.title");
+        setId_Widget(as_Widget(closeButton), "sidebar.close");
+        setFont_LabelWidget(sheetTitle, uiLabelBig_FontId);
+        setFont_LabelWidget(closeButton, uiLabelBigBold_FontId);
+        iConnect(Root, get_Root(), visualOffsetsChanged, d, updateSlidingSheetHeight_SidebarWidget_);
+    }
         iWidget *buttons = new_Widget();        
         setId_Widget(buttons, "buttons");
         setDrawBufferEnabled_Widget(buttons, iTrue);
         for (int i = 0; i < max_SidebarMode; i++) {
-            if (deviceType_App() == phone_AppDeviceType && i == identities_SidebarMode) {
+        if (i == identities_SidebarMode && deviceType_App() != desktop_AppDeviceType) {
+            /* On mobile, identities are managed via Settings. */
                 continue;
             }
             d->modeButtons[i] = addChildFlags_Widget(
@@ -815,51 +865,54 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
                     tightModeLabels_[i],
                     format_CStr("%s.mode arg:%d", cstr_String(id_Widget(w)), i))),
                     frameless_WidgetFlag | noBackground_WidgetFlag);
+        as_Widget(d->modeButtons[i])->flags2 |= slidingSheetDraggable_WidgetFlag2; /* phone */
         }
         setButtonFont_SidebarWidget(d, isPhone ? uiLabelBig_FontId : uiLabel_FontId);
         addChildFlags_Widget(vdiv,
                              iClob(buttons),
-                             arrangeHorizontal_WidgetFlag |
-                                 resizeWidthOfChildren_WidgetFlag |
-                             arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag); // |
-//                             drawBackgroundToHorizontalSafeArea_WidgetFlag);
+                         arrangeHorizontal_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
+                             arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag);
         setBackgroundColor_Widget(buttons, uiBackgroundSidebar_ColorId);
-    }
-    else {
-        iLabelWidget *heading = new_LabelWidget(person_Icon " ${sidebar.identities}", NULL);
-        checkIcon_LabelWidget(heading);
-        setBackgroundColor_Widget(as_Widget(heading), uiBackgroundSidebar_ColorId);
-        setTextColor_LabelWidget(heading, uiTextSelected_ColorId);
-        setFont_LabelWidget(addChildFlags_Widget(vdiv, iClob(heading), borderTop_WidgetFlag |
-                                                 alignLeft_WidgetFlag | frameless_WidgetFlag |
-                                                 drawBackgroundToHorizontalSafeArea_WidgetFlag),
-                            uiLabelLargeBold_FontId);
-    }
     iWidget *content = new_Widget();
     setFlags_Widget(content, resizeChildren_WidgetFlag, iTrue);
     iWidget *listAndActions = makeVDiv_Widget();
     addChild_Widget(content, iClob(listAndActions));
+    iWidget *listArea = new_Widget();
+    setFlags_Widget(listArea, resizeChildren_WidgetFlag, iTrue);
     d->list = new_ListWidget();
     setPadding_Widget(as_Widget(d->list), 0, gap_UI, 0, gap_UI);
+    addChild_Widget(listArea, iClob(d->list));
+    if (!isPhone) {
+        d->certList = new_CertListWidget();
+        setPadding_Widget(as_Widget(d->certList), 0, gap_UI, 0, gap_UI);
+        addChild_Widget(listArea, iClob(d->certList));
+    }
     addChildFlags_Widget(listAndActions,
-                         iClob(d->list),
+                         iClob(listArea),
                          expand_WidgetFlag); // | drawBackgroundToHorizontalSafeArea_WidgetFlag);
     setId_Widget(addChildPosFlags_Widget(listAndActions,
                                          iClob(d->actions = new_Widget()),
-                                         isPhone ? front_WidgetAddPos : back_WidgetAddPos,
+                                         /*isPhone ? front_WidgetAddPos :*/ back_WidgetAddPos,
                                          arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag |
                                          resizeWidthOfChildren_WidgetFlag), // |
 //                                             drawBackgroundToHorizontalSafeArea_WidgetFlag),
                  "actions");
+    if (deviceType_App() != desktop_AppDeviceType) {
+        setFlags_Widget(findChild_Widget(w, "sidebar.title"), borderTop_WidgetFlag, iTrue);
+        setFlags_Widget(d->actions, drawBackgroundToBottom_WidgetFlag, iTrue);
+        setBackgroundColor_Widget(d->actions, uiBackground_ColorId);
+    }
+    else {
     setBackgroundColor_Widget(d->actions, uiBackgroundSidebar_ColorId);
+    }
     d->contextItem = NULL;
     d->contextIndex = iInvalidPos;
     d->blank = new_Widget();
     addChildFlags_Widget(content, iClob(d->blank), resizeChildren_WidgetFlag);
     addChildFlags_Widget(vdiv, iClob(content), expand_WidgetFlag);
     setMode_SidebarWidget(d,
-                          deviceType_App() == phone_AppDeviceType && d->side == right_SidebarSide ?
-                          identities_SidebarMode : bookmarks_SidebarMode);
+                          /*deviceType_App() == phone_AppDeviceType && d->side == right_SidebarSide ?
+                          identities_SidebarMode :*/ bookmarks_SidebarMode);
     d->resizer =
         addChildFlags_Widget(w,
                              iClob(new_Widget()),
@@ -867,7 +920,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
                                  resizeToParentHeight_WidgetFlag |
                                  (side == left_SidebarSide ? moveToParentRightEdge_WidgetFlag
                                                            : moveToParentLeftEdge_WidgetFlag));
-    if (deviceType_App() == phone_AppDeviceType) {
+    if (deviceType_App() != desktop_AppDeviceType) {
         setFlags_Widget(d->resizer, hidden_WidgetFlag | disabled_WidgetFlag, iTrue);
     }
     setId_Widget(d->resizer, side == left_SidebarSide ? "sidebar.grab" : "sidebar2.grab");
@@ -902,16 +955,16 @@ iBool setButtonFont_SidebarWidget(iSidebarWidget *d, int font) {
 
 static const iGmIdentity *constHoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
     if (d->mode == identities_SidebarMode) {
-        const iSidebarItem *hoverItem = constHoverItem_ListWidget(d->list);
-        if (hoverItem) {
-            return identity_GmCerts(certs_App(), hoverItem->id);
+        return constHoverIdentity_CertListWidget(d->certList);
         }
-    }
     return NULL;
 }
 
 static iGmIdentity *hoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
-    return iConstCast(iGmIdentity *, constHoverIdentity_SidebarWidget_(d));
+    if (d->mode == identities_SidebarMode) {
+        return hoverIdentity_CertListWidget(d->certList);
+    }
+    return NULL;
 }
 
 static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, size_t itemIndex) {
@@ -923,7 +976,6 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, si
                 const iGmHeading *head = constAt_Array(headings_GmDocument(doc), item->id);
                 postCommandf_App("document.goto loc:%p", head->text.start);
                 dismissPortraitPhoneSidebars_Root(as_Widget(d)->root);
-                setOpenedFromSidebar_DocumentWidget(document_App(), iTrue);
             }
             break;
         }
@@ -945,6 +997,12 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, si
                 updateItems_SidebarWidget_(d);
                 break;
             }
+            if (d->isEditing) {
+                d->contextItem = item;
+                d->contextIndex = itemIndex;
+                postCommand_Widget(d, "bookmark.edit");
+                break;
+            }
             /* fall through */
         case history_SidebarMode: {
             if (!isEmpty_String(&item->url)) {
@@ -954,23 +1012,6 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, si
             }
             break;
         }
-        case identities_SidebarMode: {
-            d->contextItem  = item;
-            if (d->contextIndex != iInvalidPos) {
-                invalidateItem_ListWidget(d->list, d->contextIndex);
-            }
-            d->contextIndex = itemIndex;
-            if (itemIndex < numItems_ListWidget(d->list)) {
-                updateContextMenu_SidebarWidget_(d);
-                arrange_Widget(d->menu);
-                openMenu_Widget(d->menu,
-                                d->side == left_SidebarSide
-                                    ? topRight_Rect(itemRect_ListWidget(d->list, itemIndex))
-                                    : addX_I2(topLeft_Rect(itemRect_ListWidget(d->list, itemIndex)),
-                                              -width_Widget(d->menu)));
-            }
-            break;
-        }
         default:
             break;
     }
@@ -990,7 +1031,7 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
 //            updateMetrics_SidebarWidget_(d);
             updateItemHeight_SidebarWidget_(d);
         }
-        setButtonFont_SidebarWidget(d, isPortrait_App() ? uiLabelBig_FontId : uiLabel_FontId);
+        setButtonFont_SidebarWidget(d, isPortrait_App() ? uiLabelMedium_FontId : uiLabel_FontId);
     }
     const iBool isTight =
         (width_Rect(bounds_Widget(as_Widget(d->modeButtons[0]))) < d->maxButtonLabelWidth);
@@ -1018,6 +1059,7 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
 }
 
 void setWidth_SidebarWidget(iSidebarWidget *d, float widthAsGaps) {
+    if (!d) return;
     iWidget *w = as_Widget(d);
     const iBool isFixedWidth = deviceType_App() == phone_AppDeviceType;
     int width = widthAsGaps * gap_UI; /* in pixels */
@@ -1056,19 +1098,16 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                 set_String(&bm->url, url);
                 set_String(&bm->tags, tags);
                 if (isEmpty_String(icon)) {
-                    removeTag_Bookmark(bm, userIcon_BookmarkTag);
+                    bm->flags &= ~userIcon_BookmarkFlag;
                     bm->icon = 0;
                 }
                 else {
-                    addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
+                    bm->flags |= userIcon_BookmarkFlag;
                     bm->icon = first_String(icon);
                 }
-                addOrRemoveTag_Bookmark(bm, homepage_BookmarkTag,
-                                        isSelected_Widget(findChild_Widget(editor, "bmed.tag.home")));
-                addOrRemoveTag_Bookmark(bm, remoteSource_BookmarkTag,
-                                        isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
-                addOrRemoveTag_Bookmark(bm, linkSplit_BookmarkTag,
-                                        isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
+                iChangeFlags(bm->flags, homepage_BookmarkFlag, isSelected_Widget(findChild_Widget(editor, "bmed.tag.home")));
+                iChangeFlags(bm->flags, remoteSource_BookmarkFlag, isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
+                iChangeFlags(bm->flags, linkSplit_BookmarkFlag, isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
             }
             const iBookmark *folder = userData_Object(findChild_Widget(editor, "bmed.folder"));
             if (!folder || !hasParent_Bookmark(folder, id_Bookmark(bm))) {
@@ -1083,6 +1122,36 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
     return iFalse;
 }
 
+enum iSlidingSheetPos {
+    top_SlidingSheetPos,
+    middle_SlidingSheetPos,
+    bottom_SlidingSheetPos,
+};
+
+static void setSlidingSheetPos_SidebarWidget_(iSidebarWidget *d, enum iSlidingSheetPos slide) {
+    iWidget *w = as_Widget(d);
+    const int pos = w->rect.pos.y;
+    const iRect safeRect = safeRect_Root(w->root);
+    if (slide == top_SlidingSheetPos) {
+        w->rect.pos.y = top_Rect(safeRect);
+        w->rect.size.y = height_Rect(safeRect);
+        setVisualOffset_Widget(w, pos - w->rect.pos.y, 0, 0);
+        setVisualOffset_Widget(w, 0, 200, easeOut_AnimFlag | softer_AnimFlag);
+        setScrollMode_ListWidget(d->list, disabledAtTopUpwards_ScrollMode);
+    }
+    else if (slide == bottom_SlidingSheetPos) {
+        postCommand_Widget(w, "sidebar.toggle");
+    }
+    else {
+        w->rect.size.y = d->midHeight;
+        w->rect.pos.y = height_Rect(safeRect) - w->rect.size.y;
+        setVisualOffset_Widget(w, pos - w->rect.pos.y, 0, 0);
+        setVisualOffset_Widget(w, 0, 200, easeOut_AnimFlag | softer_AnimFlag);
+        setScrollMode_ListWidget(d->list, disabledAtTopBothDirections_ScrollMode);
+    }
+//    animateSlidingSheetHeight_SidebarWidget_(d);
+}
+
 static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *cmd) {
     iWidget *w = as_Widget(d);
     if (equal_Command(cmd, "width")) {
@@ -1112,13 +1181,18 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                                  argLabel_Command(cmd, "noanim") == 0 &&
                                  (d->side == left_SidebarSide || deviceType_App() != phone_AppDeviceType);
         int visX = 0;
+        int visY = 0;
         if (isVisible_Widget(w)) {
             visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect);
+            visY = top_Rect(bounds_Widget(w)) - top_Rect(w->root->widget->rect);
         }
-        setFlags_Widget(w, hidden_WidgetFlag, isVisible_Widget(w));
+        const iBool isHiding = isVisible_Widget(w);
+        setFlags_Widget(w, hidden_WidgetFlag, isHiding);
         /* Safe area inset for mobile. */
         const int safePad = (d->side == left_SidebarSide ? left_Rect(safeRect_Root(w->root)) : 0);
-        if (isVisible_Widget(w)) {
+        const int animFlags = easeOut_AnimFlag | softer_AnimFlag;
+        if (!isPortraitPhone_App()) {
+            if (!isHiding) {
             setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
             w->rect.size.x = d->widthAsGaps * gap_UI;
             invalidate_ListWidget(d->list);
@@ -1126,7 +1200,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                 setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
                 setVisualOffset_Widget(
                     w, (d->side == left_SidebarSide ? -1 : 1) * (w->rect.size.x + safePad), 0, 0);
-                setVisualOffset_Widget(w, 0, 300, easeOut_AnimFlag | softer_AnimFlag);
+                    setVisualOffset_Widget(w, 0, 300, animFlags);
             }
         }
         else if (isAnimated) {
@@ -1134,19 +1208,42 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
             if (d->side == right_SidebarSide) {
                 setVisualOffset_Widget(w, visX, 0, 0);
                 setVisualOffset_Widget(
-                    w, visX + w->rect.size.x + safePad, 300, easeOut_AnimFlag | softer_AnimFlag);
+                        w, visX + w->rect.size.x + safePad, 300, animFlags);
             }
             else {
                 setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
                 setVisualOffset_Widget(
-                    w, -w->rect.size.x - safePad, 300, easeOut_AnimFlag | softer_AnimFlag);
+                        w, -w->rect.size.x - safePad, 300, animFlags);
+                }
             }
+            setScrollMode_ListWidget(d->list, normal_ScrollMode);
+        }
+        else {
+            /* Portrait phone sidebar works differently: it slides up from the bottom. */
+            setFlags_Widget(w, horizontalOffset_WidgetFlag, iFalse);
+            if (!isHiding) {
+                invalidate_ListWidget(d->list);
+                w->rect.pos.y = height_Rect(safeRect_Root(w->root)) - d->midHeight;
+                setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 0, 0);
+                setVisualOffset_Widget(w, 0, 300, animFlags);
+                //animateSlidingSheetHeight_SidebarWidget_(d);
+                setScrollMode_ListWidget(d->list, disabledAtTopBothDirections_ScrollMode);
+            }
+            else {
+                setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
+                if (d->isEditing) {
+                    setMobileEditMode_SidebarWidget_(d, iFalse);
+            }
+        }
+            showToolbar_Root(w->root, isHiding);
         }
         updateToolbarColors_Root(w->root);
         arrange_Widget(w->parent);
         /* BUG: Rearranging because the arrange above didn't fully resolve the height. */
         arrange_Widget(w);
+        if (!isPortraitPhone_App()) {
         updateSize_DocumentWidget(document_App());
+        }
         if (isVisible_Widget(w)) {
             updateItems_SidebarWidget_(d);
             scrollOffset_ListWidget(d->list, 0);
@@ -1154,6 +1251,10 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         refresh_Widget(w->parent);
         return iTrue;
     }
+    else if (equal_Command(cmd, "bookmarks.edit")) {
+        setMobileEditMode_SidebarWidget_(d, !d->isEditing);
+        invalidate_ListWidget(d->list);
+    }
     return iFalse;
 }
 
@@ -1166,7 +1267,7 @@ static void bookmarkMoved_SidebarWidget_(iSidebarWidget *d, size_t index, size_t
                                                             : dstIndex);
     if (isLast && isBefore) isBefore = iFalse;
     const iBookmark *dst = get_Bookmarks(bookmarks_App(), dstItem->id);
-    if (hasParent_Bookmark(dst, movingItem->id) || hasTag_Bookmark(dst, remote_BookmarkTag)) {
+    if (hasParent_Bookmark(dst, movingItem->id) || dst->flags & remote_BookmarkFlag) {
         /* Can't move a folder inside itself, and remote bookmarks cannot be reordered. */
         return;
     }
@@ -1190,20 +1291,41 @@ static void bookmarkMovedOntoFolder_SidebarWidget_(iSidebarWidget *d, size_t ind
 static size_t numBookmarks_(const iPtrArray *bmList) {
     size_t num = 0;
     iConstForEach(PtrArray, i, bmList) {
-        if (!isFolder_Bookmark(i.ptr) && !hasTag_Bookmark(i.ptr, remote_BookmarkTag)) {
+        const iBookmark *bm = i.ptr;
+        if (!isFolder_Bookmark(bm) && ~bm->flags & remote_BookmarkFlag) {
             num++;
         }
     }
     return num;
 }
 
+static iRangei SlidingSheetMiddleRegion_SidebarWidget_(const iSidebarWidget *d) {
+    const iWidget *w = constAs_Widget(d);
+    const iRect safeRect = safeRect_Root(w->root);
+    const int midY = bottom_Rect(safeRect) - d->midHeight;
+    const int topHalf = (top_Rect(safeRect) + midY) / 2;
+    const int bottomHalf = (bottom_Rect(safeRect) + midY * 2) / 3;
+    return (iRangei){ topHalf, bottomHalf };
+}
+
+static void gotoNearestSlidingSheetPos_SidebarWidget_(iSidebarWidget *d) {
+    const iRangei midRegion = SlidingSheetMiddleRegion_SidebarWidget_(d);
+    const int pos = top_Rect(d->widget.rect);
+    setSlidingSheetPos_SidebarWidget_(d, pos < midRegion.start
+                                      ? top_SlidingSheetPos
+                                      : pos > midRegion.end ? bottom_SlidingSheetPos
+                                                            : middle_SlidingSheetPos);
+}
+
 static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     /* Handle commands. */
     if (isResize_UserEvent(ev)) {
         checkModeButtonLayout_SidebarWidget_(d);
-        if (deviceType_App() == phone_AppDeviceType && d->side == left_SidebarSide) {
-            setFlags_Widget(w, rightEdgeDraggable_WidgetFlag, isPortrait_App());
+        if (deviceType_App() == phone_AppDeviceType) {
+            setPadding_Widget(d->actions, 0, 0, 0, 0);
+            setFlags_Widget(findChild_Widget(w, "sidebar.title"), hidden_WidgetFlag, isLandscape_App());
+            setFlags_Widget(findChild_Widget(w, "sidebar.close"), hidden_WidgetFlag, isLandscape_App());
             /* In landscape, visibility of the toolbar is controlled separately. */
             if (isVisible_Widget(w)) {
                 postCommand_Widget(w, "sidebar.toggle");
@@ -1217,8 +1339,16 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             setFlags_Widget(as_Widget(d->list),
                             drawBackgroundToHorizontalSafeArea_WidgetFlag,
                             isLandscape_App());
-            return iFalse;
+            setFlags_Widget(w,
+                            drawBackgroundToBottom_WidgetFlag,
+                            isPortrait_App());
+            setBackgroundColor_Widget(w, isPortrait_App() ? uiBackgroundSidebar_ColorId : none_ColorId);
+        }
+        if (!isPortraitPhone_App()) {
+            /* In sliding sheet mode, sidebar is resized to fit in the safe area. */
+            setPadding_Widget(d->actions, 0, 0, 0, bottomSafeInset_Mobile());
         }
+            return iFalse;
     }
     else if (isMetricsChange_UserEvent(ev)) {
         if (isVisible_Widget(w)) {
@@ -1230,7 +1360,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
     }
     else if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
         const char *cmd = command_UserEvent(ev);
-        if (equal_Command(cmd, "tabs.changed") || equal_Command(cmd, "document.changed")) {
+        if (startsWith_CStr(cmd, "tabs.changed id:doc") || equal_Command(cmd, "document.changed")) {
             updateItems_SidebarWidget_(d);
             scrollOffset_ListWidget(d->list, 0);
         }
@@ -1257,13 +1387,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 }
             }
         }
-        else if (equal_Command(cmd, "idents.changed") && d->mode == identities_SidebarMode) {
-            updateItems_SidebarWidget_(d);
-        }
-        else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "toolbar.showident")) {
-            postCommandf_App("sidebar.mode arg:%d toggle:1", identities_SidebarMode);
-            return iTrue;
-        }
         else if (isPortraitPhone_App() && isVisible_Widget(w) && d->side == left_SidebarSide &&
                  equal_Command(cmd, "swipe.forward")) {
             postCommand_App("sidebar.toggle");
@@ -1328,9 +1451,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-//        else if (isCommand_Widget(w, ev, "menu.closed")) {
-         //   invalidateItem_ListWidget(d->list, d->contextIndex);
-//        }
         else if (isCommand_Widget(w, ev, "bookmark.open")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
@@ -1363,13 +1483,13 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 if (!isFolder_Bookmark(bm)) {
                     setText_InputWidget(urlInput, &bm->url);
                     setText_InputWidget(tagsInput, &bm->tags);
-                    if (hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
+                    if (bm->flags & userIcon_BookmarkFlag) {
                         setText_InputWidget(iconInput,
                                             collect_String(newUnicodeN_String(&bm->icon, 1)));
                     }
-                    setToggle_Widget(homeTag, hasTag_Bookmark(bm, homepage_BookmarkTag));
-                    setToggle_Widget(remoteSourceTag, hasTag_Bookmark(bm, remoteSource_BookmarkTag));
-                    setToggle_Widget(linkSplitTag, hasTag_Bookmark(bm, linkSplit_BookmarkTag));
+                    setToggle_Widget(homeTag, bm->flags & homepage_BookmarkFlag);
+                    setToggle_Widget(remoteSourceTag, bm->flags & remoteSource_BookmarkFlag);
+                    setToggle_Widget(linkSplitTag, bm->flags & linkSplit_BookmarkFlag);
                 }
                 else {
                     setFlags_Widget(findChild_Widget(dlg, "bmed.special"),
@@ -1390,7 +1510,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
-                const iBool isRemote = hasTag_Bookmark(bm, remote_BookmarkTag);
+                const iBool isRemote = (bm->flags & remote_BookmarkFlag) != 0;
                 iChar icon = isRemote ? 0x1f588 : bm->icon;
                 iWidget *dlg = makeBookmarkCreation_Widget(&bm->url, &bm->title, icon);
                 setId_Widget(dlg, format_CStr("bmed.%s", cstr_String(id_Widget(w))));
@@ -1404,17 +1524,16 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (isCommand_Widget(w, ev, "bookmark.tag")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
-                const char *tag = cstr_String(string_Command(cmd, "tag"));
+                const iRangecc tag = range_Command(cmd, "tag");
+                const int      flag =
+                    (equal_Rangecc(tag, "homepage") ? homepage_BookmarkFlag : 0) |
+                    (equal_Rangecc(tag, "subscribed") ? subscribed_BookmarkFlag : 0) |
+                    (equal_Rangecc(tag, "remotesource") ? remoteSource_BookmarkFlag : 0);
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
-                if (hasTag_Bookmark(bm, tag)) {
-                    removeTag_Bookmark(bm, tag);
-                    if (!iCmpStr(tag, subscribed_BookmarkTag)) {
-                        removeEntries_Feeds(item->id);
-                    }
-                }
-                else {
-                    addTag_Bookmark(bm, tag);
+                if (flag == subscribed_BookmarkFlag && (bm->flags & flag)) {
+                    removeEntries_Feeds(item->id); /* get rid of unsubscribed entries */
                 }
+                bm->flags ^= flag;
                 postCommand_App("bookmarks.changed");
             }
             return iTrue;
@@ -1491,6 +1610,15 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             return iTrue;
         }
         else if (equal_Command(cmd, "feeds.markallread") && d->mode == feeds_SidebarMode) {
+            if (argLabel_Command(cmd, "confirm")) {
+                /* This is used on mobile. */
+                iWidget *menu = makeMenu_Widget(w->root->widget, (iMenuItem[]){
+                    check_Icon " " uiTextCaution_ColorEscape "${feeds.markallread}", 0, 0,
+                    "feeds.markallread"
+                }, 1);
+                openMenu_Widget(menu, topLeft_Rect(bounds_Widget(d->actions)));
+                return iTrue;
+            }
             iConstForEach(PtrArray, i, listEntries_Feeds()) {
                 const iFeedEntry *entry = i.ptr;
                 const iString *url = url_FeedEntry(entry);
@@ -1539,7 +1667,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     }
                     if (isCommand_Widget(w, ev, "feed.entry.unsubscribe")) {
                         if (arg_Command(cmd)) {
-                            removeTag_Bookmark(feedBookmark, subscribed_BookmarkTag);
+                            feedBookmark->flags &= ~subscribed_BookmarkFlag;
                             removeEntries_Feeds(id_Bookmark(feedBookmark));
                             updateItems_SidebarWidget_(d);
                         }
@@ -1555,108 +1683,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                       0,
                                       format_CStr("!feed.entry.unsubscribe arg:1 ptr:%p", d) } },
                                 2);
-                        }
-                        return iTrue;
-                    }
-                }
-            }
-        }
-        else if (isCommand_Widget(w, ev, "ident.use")) {
-            iGmIdentity *  ident  = menuIdentity_SidebarWidget_(d);
-            const iString *tabUrl = url_DocumentWidget(document_App());
-            if (ident) {
-                if (argLabel_Command(cmd, "clear")) {
-                    clearUse_GmIdentity(ident);
-                }
-                else if (arg_Command(cmd)) {
-                    signIn_GmCerts(certs_App(), ident, tabUrl);
-                    postCommand_App("navigate.reload");
-                }
-                else {
-                    signOut_GmCerts(certs_App(), tabUrl);
-                    postCommand_App("navigate.reload");
-                }
-                saveIdentities_GmCerts(certs_App());
-                updateItems_SidebarWidget_(d);
-            }
-            return iTrue;
-        }
-        else if (isCommand_Widget(w, ev, "ident.edit")) {
-            const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
-            if (ident) {
-                makeValueInput_Widget(get_Root()->widget,
-                                      &ident->notes,
-                                      uiHeading_ColorEscape "${heading.ident.notes}",
-                                      format_CStr(cstr_Lang("dlg.ident.notes"), cstr_String(name_GmIdentity(ident))),
-                                      uiTextAction_ColorEscape "${dlg.default}",
-                                      format_CStr("!ident.setnotes ident:%p ptr:%p", ident, d));
-            }
-            return iTrue;
-        }
-        else if (isCommand_Widget(w, ev, "ident.fingerprint")) {
-            const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
-            if (ident) {
-                const iString *fps = collect_String(
-                    hexEncode_Block(collect_Block(fingerprint_TlsCertificate(ident->cert))));
-                SDL_SetClipboardText(cstr_String(fps));
             }
             return iTrue;
         }
-        else if (isCommand_Widget(w, ev, "ident.export")) {
-            const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
-            if (ident) {
-                iString *pem = collect_String(pem_TlsCertificate(ident->cert));
-                append_String(pem, collect_String(privateKeyPem_TlsCertificate(ident->cert)));
-                iDocumentWidget *expTab = newTab_App(NULL, iTrue);
-                setUrlAndSource_DocumentWidget(
-                    expTab,
-                    collectNewFormat_String("file:%s.pem", cstr_String(name_GmIdentity(ident))),
-                    collectNewCStr_String("text/plain"),
-                    utf8_String(pem));
             }
-            return iTrue;
-        }
-        else if (isCommand_Widget(w, ev, "ident.setnotes")) {
-            iGmIdentity *ident = pointerLabel_Command(cmd, "ident");
-            if (ident) {
-                setCStr_String(&ident->notes, suffixPtr_Command(cmd, "value"));
-                updateItems_SidebarWidget_(d);
-            }
-            return iTrue;
-        }
-        else if (isCommand_Widget(w, ev, "ident.pickicon")) {
-            return iTrue;
-        }
-        else if (isCommand_Widget(w, ev, "ident.reveal")) {
-            const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
-            if (ident) {
-                const iString *crtPath = certificatePath_GmCerts(certs_App(), ident);
-                if (crtPath) {
-                    revealPath_App(crtPath);
-                }
             }
-            return iTrue;
-        }
-        else if (isCommand_Widget(w, ev, "ident.delete")) {
-            iSidebarItem *item = d->contextItem;
-            if (argLabel_Command(cmd, "confirm")) {
-                makeQuestion_Widget(
-                    uiTextCaution_ColorEscape "${heading.ident.delete}",
-                    format_CStr(cstr_Lang("dlg.confirm.ident.delete"),
-                                uiTextAction_ColorEscape,
-                                cstr_String(&item->label),
-                                uiText_ColorEscape),
-                    (iMenuItem[]){ { "${cancel}", 0, 0, NULL },
-                                   { uiTextCaution_ColorEscape "${dlg.ident.delete}",
-                                     0,
-                                     0,
-                                     format_CStr("!ident.delete confirm:0 ptr:%p", d) } },
-                    2);
-                return iTrue;
-            }
-            deleteIdentity_GmCerts(certs_App(), menuIdentity_SidebarWidget_(d));
-            postCommand_App("idents.changed");
-            return iTrue;
         }
         else if (isCommand_Widget(w, ev, "history.delete")) {
             if (d->contextItem && !isEmpty_String(&d->contextItem->url)) {
@@ -1711,14 +1742,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         /* Update cursor. */
         else if (contains_Widget(w, mouse)) {
             const iSidebarItem *item = constHoverItem_ListWidget(d->list);
-            if (item && d->mode != identities_SidebarMode) {
                 setCursor_Window(get_Window(),
-                                 item->listItem.isSeparator ? SDL_SYSTEM_CURSOR_ARROW
-                                                            : SDL_SYSTEM_CURSOR_HAND);
-            }
-            else {
-                setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
-            }
+                             item ? (item->listItem.isSeparator ? SDL_SYSTEM_CURSOR_ARROW
+                                                                : SDL_SYSTEM_CURSOR_HAND)
+                                  : SDL_SYSTEM_CURSOR_ARROW);
         }
         if (d->contextIndex != iInvalidPos) {
             invalidateItem_ListWidget(d->list, d->contextIndex);
@@ -1726,7 +1753,14 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         }
     }
     /* Update context menu items. */
-    if ((d->menu || d->mode == identities_SidebarMode) && ev->type == SDL_MOUSEBUTTONDOWN) {
+    if (d->menu && ev->type == SDL_MOUSEBUTTONDOWN) {
+        if (isSlidingSheet_SidebarWidget_(d) &&
+            ev->button.button == SDL_BUTTON_LEFT &&
+            isVisible_Widget(d) &&
+            !contains_Widget(w, init_I2(ev->button.x, ev->button.y))) {
+            setSlidingSheetPos_SidebarWidget_(d, bottom_SlidingSheetPos);
+            return iTrue;
+        }
         if (ev->button.button == SDL_BUTTON_RIGHT) {
             d->contextItem = NULL;
             if (!isVisible_Widget(d->menu)) {
@@ -1739,7 +1773,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     invalidateItem_ListWidget(d->list, d->contextIndex);
                 }
                 d->contextIndex = hoverItemIndex_ListWidget(d->list);
-                updateContextMenu_SidebarWidget_(d);                
                 /* TODO: Some callback-based mechanism would be nice for updating menus right
                    before they open? At least move these to `updateContextMenu_ */
                 if (d->mode == bookmarks_SidebarMode && d->contextItem) {
@@ -1747,17 +1780,17 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     if (bm) {
                         setMenuItemLabel_Widget(d->menu,
                                                 "bookmark.tag tag:homepage",
-                                                hasTag_Bookmark(bm, homepage_BookmarkTag)
+                                                bm->flags & homepage_BookmarkFlag
                                                     ? home_Icon " ${bookmark.untag.home}"
                                                     : home_Icon " ${bookmark.tag.home}");
                         setMenuItemLabel_Widget(d->menu,
                                                 "bookmark.tag tag:subscribed",
-                                                hasTag_Bookmark(bm, subscribed_BookmarkTag)
+                                                bm->flags & subscribed_BookmarkFlag
                                                     ? star_Icon " ${bookmark.untag.sub}"
                                                     : star_Icon " ${bookmark.tag.sub}");
                         setMenuItemLabel_Widget(d->menu,
                                                 "bookmark.tag tag:remotesource",
-                                                hasTag_Bookmark(bm, remoteSource_BookmarkTag)
+                                                bm->flags & remoteSource_BookmarkFlag
                                                     ? downArrowBar_Icon " ${bookmark.untag.remote}"
                                                     : downArrowBar_Icon " ${bookmark.tag.remote}");
                     }
@@ -1769,29 +1802,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                             isRead ? circle_Icon " ${feeds.entry.markunread}"
                                                    : circleWhite_Icon " ${feeds.entry.markread}");
                 }
-                else if (d->mode == identities_SidebarMode) {
-                    const iGmIdentity *ident  = constHoverIdentity_SidebarWidget_(d);
-                    const iString *    docUrl = url_DocumentWidget(document_App());
-                    iForEach(ObjectList, i, children_Widget(d->menu)) {
-                        if (isInstance_Object(i.object, &Class_LabelWidget)) {
-                            iLabelWidget *menuItem = i.object;
-                            const char *  cmdItem  = cstr_String(command_LabelWidget(menuItem));
-                            if (equal_Command(cmdItem, "ident.use")) {
-                                const iBool cmdUse   = arg_Command(cmdItem) != 0;
-                                const iBool cmdClear = argLabel_Command(cmdItem, "clear") != 0;
-                                setFlags_Widget(
-                                    as_Widget(menuItem),
-                                    disabled_WidgetFlag,
-                                    (cmdClear && !isUsed_GmIdentity(ident)) ||
-                                        (!cmdClear && cmdUse && isUsedOn_GmIdentity(ident, docUrl)) ||
-                                        (!cmdClear && !cmdUse && !isUsedOn_GmIdentity(ident, docUrl)));
                             }
                         }
                     }
-                }
-            }
-        }
-    }
     if (ev->type == SDL_KEYDOWN) {
         const int key   = ev->key.keysym.sym;
         const int kmods = keyMods_Sym(ev->key.keysym.mod);
@@ -1801,6 +1814,61 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             return iTrue;
         }
     }
+    if (isSlidingSheet_SidebarWidget_(d)) {
+        if (ev->type == SDL_MOUSEWHEEL) {
+            enum iWidgetTouchMode touchMode = widgetMode_Touch(w);
+            if (touchMode == momentum_WidgetTouchMode) {
+                /* We don't do momentum. */
+                float swipe = stopWidgetMomentum_Touch(w) / gap_UI;
+//                printf("swipe: %f\n", swipe);
+                const iRangei midRegion = SlidingSheetMiddleRegion_SidebarWidget_(d);
+                const int pos = top_Rect(w->rect);
+                if (swipe < 170) {
+                    gotoNearestSlidingSheetPos_SidebarWidget_(d);
+                }
+                else if (swipe > 500 && ev->wheel.y > 0) {
+                    /* Fast swipe down will dismiss. */
+                    setSlidingSheetPos_SidebarWidget_(d, bottom_SlidingSheetPos);
+                }
+                else if (ev->wheel.y < 0) {
+                    setSlidingSheetPos_SidebarWidget_(d, top_SlidingSheetPos);
+                }
+                else if (pos < (midRegion.start + midRegion.end) / 2) {
+                    setSlidingSheetPos_SidebarWidget_(d, middle_SlidingSheetPos);
+                }
+                else {
+                    setSlidingSheetPos_SidebarWidget_(d, bottom_SlidingSheetPos);
+                }
+            }
+            else if (touchMode == touch_WidgetTouchMode) {
+                /* Move with the finger. */
+                adjustEdges_Rect(&w->rect, ev->wheel.y, 0, 0, 0);
+                /* Upon reaching the top, scrolling is switched back to the list. */
+                const iRect rootRect = safeRect_Root(w->root);
+                const int top = top_Rect(rootRect);
+                if (w->rect.pos.y < top) {
+                    setScrollMode_ListWidget(d->list, disabledAtTopUpwards_ScrollMode);
+                    setScrollPos_ListWidget(d->list, top - w->rect.pos.y);
+                    transferAffinity_Touch(w, as_Widget(d->list));
+                    w->rect.pos.y = top;
+                    w->rect.size.y = height_Rect(rootRect);
+                }
+                else {
+                    setScrollMode_ListWidget(d->list, disabled_ScrollMode);
+                }
+                arrange_Widget(w);
+                refresh_Widget(w);
+            }
+            else {
+                return iFalse;
+            }
+            return iTrue;
+        }
+        if (ev->type == SDL_USEREVENT && ev->user.code == widgetTouchEnds_UserEventCode) {
+            gotoNearestSlidingSheetPos_SidebarWidget_(d);
+            return iTrue;
+        }
+    }
     if (ev->type == SDL_MOUSEBUTTONDOWN &&
         contains_Widget(as_Widget(d->list), init_I2(ev->button.x, ev->button.y))) {
         if (hoverItem_ListWidget(d->list) || isVisible_Widget(d->menu)) {
@@ -1811,13 +1879,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 const iSidebarItem *hoverItem = hoverItem_ListWidget(d->list);
                 iAssert(hoverItem);
                 const iBookmark *  bm              = get_Bookmarks(bookmarks_App(), hoverItem->id);
-                const iBool        isRemote        = hasTag_Bookmark(bm, remote_BookmarkTag);
+                const iBool        isRemote        = (bm->flags & remote_BookmarkFlag) != 0;
                 static const char *localOnlyCmds[] = { "bookmark.edit",
                                                        "bookmark.delete",
-                                                       "bookmark.tag tag:" subscribed_BookmarkTag,
-                                                       "bookmark.tag tag:" homepage_BookmarkTag,
-                                                       "bookmark.tag tag:" remoteSource_BookmarkTag,
-                                                       "bookmark.tag tag:" subscribed_BookmarkTag };
+                                                       "bookmark.tag tag:subscribed",
+                                                       "bookmark.tag tag:homepage",
+                                                       "bookmark.tag tag:remotesource" };
                 iForIndices(i, localOnlyCmds) {
                     setFlags_Widget(as_Widget(findMenuItem_Widget(d->menu, localOnlyCmds[i])),
                                     disabled_WidgetFlag,
@@ -1838,6 +1905,9 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
     const iRect    bounds = bounds_Widget(w);
     iPaint p;
     init_Paint(&p);
+    if (d->mode == documentOutline_SidebarMode) {
+        makePaletteGlobal_GmDocument(document_DocumentWidget(document_App()));
+    }
     if (!isPortraitPhone_App()) { /* this would erase page contents during transition on the phone */
         if (flags_Widget(w) & visualOffset_WidgetFlag &&
             flags_Widget(w) & horizontalOffset_WidgetFlag && isVisible_Widget(w)) {
@@ -1860,6 +1930,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                                            &Class_SidebarWidget);
     const iBool isMenuVisible = isVisible_Widget(sidebar->menu);
     const iBool isDragging   = constDragItem_ListWidget(list) == d;
+    const iBool isEditing    = sidebar->isEditing; /* only on mobile */
     const iBool isPressing   = isMouseDown_ListWidget(list) && !isDragging;
     const iBool isHover      =
             (!isMenuVisible &&
@@ -2013,6 +2084,16 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         drawRange_Text(font, textPos, fg, range_String(&d->label));
         const int metaFont = uiLabel_FontId;
         const int metaIconWidth = 4.5f * gap_UI;
+        if (isEditing) {
+            iRect dragRect = {
+                addX_I2(topRight_Rect(itemRect), -itemHeight * 3 / 2),
+                init_I2(itemHeight * 3 / 2, itemHeight)
+            };
+            fillRect_Paint(p, dragRect, bg);
+            drawVLine_Paint(p, topLeft_Rect(dragRect), height_Rect(dragRect), uiSeparator_ColorId);
+            drawCentered_Text(uiContent_FontId, dragRect, iTrue, uiAnnotation_ColorId, menu_Icon);
+            adjustEdges_Rect(&itemRect, 0, -width_Rect(dragRect), 0, 0);
+        }
         const iInt2 metaPos =
             init_I2(right_Rect(itemRect) -
                         length_String(&d->meta) *
@@ -2091,40 +2172,6 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         }
         iEndCollect();
     }
-    else if (sidebar->mode == identities_SidebarMode) {
-        const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
-                               : uiTextStrong_ColorId;
-        const iBool isUsedOnDomain = (d->indent != 0);
-        iString icon;
-        initUnicodeN_String(&icon, &d->icon, 1);
-        iInt2 cPos = topLeft_Rect(itemRect);
-        const int indent = 1.4f * lineHeight_Text(font);
-        addv_I2(&cPos,
-                init_I2(3 * gap_UI,
-                        (itemHeight - lineHeight_Text(uiLabel_FontId) * 2 - lineHeight_Text(font)) /
-                            2));
-        const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
-                                                                     : uiTextFramelessHover_ColorId)
-                                   : uiTextDim_ColorId;
-        if (!d->listItem.isSelected && !isUsedOnDomain) {
-            drawOutline_Text(font, cPos, metaFg, none_ColorId, range_String(&icon));
-        }
-        drawRange_Text(font,
-                       cPos,
-                       d->listItem.isSelected ? iconColor
-                       : isUsedOnDomain       ? altIconColor
-                                              : uiBackgroundSidebar_ColorId,
-                       range_String(&icon));
-        deinit_String(&icon);
-        drawRange_Text(d->listItem.isSelected ? sidebar->itemFonts[1] : font,
-                       add_I2(cPos, init_I2(indent, 0)),
-                       fg,
-                       range_String(&d->label));
-        drawRange_Text(uiLabel_FontId,
-                       add_I2(cPos, init_I2(indent, lineHeight_Text(font))),
-                       metaFg,
-                       range_String(&d->meta));
-    }
 }
 
 iBeginDefineSubclass(SidebarWidget, Widget)
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 81c6681f..2a930a60 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -54,6 +54,7 @@ iBool               setMode_SidebarWidget       (iSidebarWidget *, enum iSidebar
 void                setWidth_SidebarWidget      (iSidebarWidget *, float widthAsGaps);
 iBool               setButtonFont_SidebarWidget (iSidebarWidget *, int font);
 void                setClosedFolders_SidebarWidget  (iSidebarWidget *, const iIntSet *closedFolders);
+void                setMidHeight_SidebarWidget  (iSidebarWidget *, int midHeight); /* phone layout */
 
 enum iSidebarMode   mode_SidebarWidget          (const iSidebarWidget *);
 enum iFeedsMode     feedsMode_SidebarWidget     (const iSidebarWidget *);
diff --git a/src/ui/text.c b/src/ui/text.c
index 4a4b3776..7bb418eb 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -390,14 +390,19 @@ static void deinitCache_Text_(iText *d) {
     SDL_DestroyTexture(d->cache);
 }
 
+iRegExp *makeAnsiEscapePattern_Text(void) {
+    return new_RegExp("[[()][?]?([0-9;AB]*?)([ABCDEFGHJKSTfhilmn])", 0);
+}
+
 void init_Text(iText *d, SDL_Renderer *render) {
     iText *oldActive = activeText_;
     activeText_ = d;
     init_Array(&d->fonts, sizeof(iFont));
     d->contentFontSize = contentScale_Text_;
-    d->ansiEscape      = new_RegExp("[[()][?]?([0-9;AB]*?)([ABCDEFGHJKSTfhilmn])", 0);
+    d->ansiEscape      = makeAnsiEscapePattern_Text();
     d->baseFontId      = -1;
     d->baseFgColorId   = -1;
+    d->missingGlyphs   = iFalse;
     d->render          = render;
     /* A grayscale palette for rasterized glyphs. */ {
         SDL_Color colors[256];
@@ -448,6 +453,10 @@ void setAnsiFlags_Text(int ansiFlags) {
     activeText_->ansiFlags = ansiFlags;
 }
 
+int ansiFlags_Text(void) {
+    return activeText_->ansiFlags;
+}
+
 void setDocumentFontSize_Text(iText *d, float fontSizeFactor) {
     fontSizeFactor *= contentScale_Text_;
     iAssert(fontSizeFactor > 0);
@@ -642,6 +651,37 @@ static iBool isControl_Char_(iChar c) {
 /*----------------------------------------------------------------------------------------------*/
 
 iDeclareType(AttributedRun)
+    
+enum iScript {
+    unspecified_Script,
+    arabic_Script,
+    bengali_Script,
+    devanagari_Script,
+    han_Script,
+    hiragana_Script,
+    katakana_Script,
+    oriya_Script,
+    tamil_Script,
+    max_Script
+};
+
+iLocalDef iBool isCJK_Script_(enum iScript d) {
+    return d == han_Script || d == hiragana_Script || d == katakana_Script;
+}
+
+#if defined (LAGRANGE_ENABLE_HARFBUZZ)
+static const hb_script_t hbScripts_[max_Script] = {
+    0,
+    HB_SCRIPT_ARABIC,
+    HB_SCRIPT_BENGALI,
+    HB_SCRIPT_DEVANAGARI,
+    HB_SCRIPT_HAN,
+    HB_SCRIPT_HIRAGANA,
+    HB_SCRIPT_KATAKANA,
+    HB_SCRIPT_ORIYA,
+    HB_SCRIPT_TAMIL,
+};
+#endif
 
 struct Impl_AttributedRun {
     iRangei     logical; /* UTF-32 codepoint indices in the logical-order text */
@@ -651,8 +691,7 @@ struct Impl_AttributedRun {
     iColor      bgColor_; /* any RGB color; A > 0 */
     struct {
         uint8_t isLineBreak : 1;
-//        uint8_t isRTL : 1;
-        uint8_t isArabic : 1; /* Arabic script detected */
+        uint8_t script      : 7; /* if script detected */
     } flags;
 };
 
@@ -744,7 +783,7 @@ static void finishRun_AttributedText_(iAttributedText *d, iAttributedRun *run, i
 #endif
         pushBack_Array(&d->runs, &finishedRun);
         run->flags.isLineBreak = iFalse;
-        run->flags.isArabic    = iFalse;
+        run->flags.script      = unspecified_Script;
     }
     run->logical.start = endAt;
 }
@@ -789,6 +828,7 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
             pushBack_Array(&d->logicalToSourceOffset, &(int){ ch - d->source.start });
             ch += len;
         }
+        iBool bidiOk = iFalse;
 #if defined (LAGRANGE_ENABLE_FRIBIDI)
         /* Use FriBidi to reorder the codepoints. */
         resize_Array(&d->visual, length);
@@ -796,25 +836,25 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
         resize_Array(&d->visualToLogical, length);
         d->bidiLevels = length ? malloc(length) : NULL;
         FriBidiParType baseDir = (FriBidiParType) FRIBIDI_TYPE_ON;
-        /* TODO: If this returns zero (error occurred), act like everything is LTR. */
-        fribidi_log2vis(constData_Array(&d->logical),
-                        length,
-                        &baseDir,
-                        data_Array(&d->visual),
-                        data_Array(&d->logicalToVisual),
-                        data_Array(&d->visualToLogical),
-                        (FriBidiLevel *) d->bidiLevels);
+        bidiOk = fribidi_log2vis(constData_Array(&d->logical),
+                                 (FriBidiStrIndex) length,
+                                 &baseDir,
+                                 data_Array(&d->visual),
+                                 data_Array(&d->logicalToVisual),
+                                 data_Array(&d->visualToLogical),
+                                 (FriBidiLevel *) d->bidiLevels) > 0;
         d->isBaseRTL = (overrideBaseDir == 0 ? FRIBIDI_IS_RTL(baseDir) : (overrideBaseDir < 0));
-#else
-        /* 1:1 mapping. */
-        setCopy_Array(&d->visual, &d->logical);
-        resize_Array(&d->logicalToVisual, length);
-        for (size_t i = 0; i < length; i++) {
-            set_Array(&d->logicalToVisual, i, &(int){ i });
-        }
-        setCopy_Array(&d->visualToLogical, &d->logicalToVisual);
-        d->isBaseRTL = iFalse;
 #endif
+        if (!bidiOk) {
+            /* 1:1 mapping. */
+            setCopy_Array(&d->visual, &d->logical);
+            resize_Array(&d->logicalToVisual, length);
+            for (size_t i = 0; i < length; i++) {
+                set_Array(&d->logicalToVisual, i, &(int){ i });
+            }
+            setCopy_Array(&d->visualToLogical, &d->logicalToVisual);
+            d->isBaseRTL = iFalse;
+        }
     }
     /* The mapping needs to include the terminating NULL position. */ {
         pushBack_Array(&d->logicalToSourceOffset, &(int){ d->source.end - d->source.start });
@@ -828,7 +868,6 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
         .font    = d->font,
     };
     const int     *logToSource = constData_Array(&d->logicalToSourceOffset);
-    const int *    logToVis    = constData_Array(&d->logicalToVisual);
     const iChar *  logicalText = constData_Array(&d->logical);
     iBool          isRTL       = d->isBaseRTL;
     int            numNonSpace = 0;
@@ -868,17 +907,34 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
                     /* Note: This styling is hardcoded to match `typesetOneLine_RunTypesetter_()`. */
                     if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "1")) {
                         run.attrib.bold = iTrue;
+                        run.attrib.regular = iFalse;
+                        run.attrib.light = iFalse;
                         if (d->baseFgColorId == tmParagraph_ColorId) {
                             setFgColor_AttributedRun_(&run, tmFirstParagraph_ColorId);
                         }
                         attribFont = font_Text_(fontWithStyle_Text(fontId_Text_(d->baseFont),
                                                                    bold_FontStyle));
                     }
+                    else if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "2")) {
+                        run.attrib.light = iTrue;
+                        run.attrib.regular = iFalse;
+                        run.attrib.bold = iFalse;
+                        attribFont = font_Text_(fontWithStyle_Text(fontId_Text_(d->baseFont),
+                                                                   light_FontStyle));
+                    }
                     else if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "3")) {
                         run.attrib.italic = iTrue;
                         attribFont = font_Text_(fontWithStyle_Text(fontId_Text_(d->baseFont),
                                                                    italic_FontStyle));
                     }
+                    else if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "10")) {
+                        run.attrib.regular = iTrue;
+                        run.attrib.bold = iFalse;
+                        run.attrib.light = iFalse;
+                        run.attrib.italic = iFalse;
+                        attribFont = font_Text_(fontWithStyle_Text(fontId_Text_(d->baseFont),
+                                                                   regular_FontStyle));
+                    }
                     else if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "11")) {
                         run.attrib.monospace = iTrue;
                         setFgColor_AttributedRun_(&run, tmPreformatted_ColorId);
@@ -886,7 +942,9 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
                                                                     monospace_FontId));
                     }
                     else if (equal_Rangecc(sequence, "0")) {
+                        run.attrib.regular = iFalse;
                         run.attrib.bold = iFalse;
+                        run.attrib.light = iFalse;
                         run.attrib.italic = iFalse;
                         run.attrib.monospace = iFalse;
                         attribFont = run.font = d->baseFont;
@@ -957,16 +1015,44 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
                    (int)logicalText[pos]);
 #endif
         }
+        /* Detect the script. */
 #if defined (LAGRANGE_ENABLE_FRIBIDI)
         if (fribidi_get_bidi_type(ch) == FRIBIDI_TYPE_AL) {
-            run.flags.isArabic = iTrue; /* Arabic letter */
+            run.flags.script = arabic_Script;
         }
+        else
 #endif
+        {
+            const char *scr = script_Char(ch);
+//            printf("Char %08x %lc => %s\n", ch, (int) ch, scr);
+            if (!iCmpStr(scr, "Bengali")) {
+                run.flags.script = bengali_Script;
+            }
+            else if (!iCmpStr(scr, "Devanagari")) {
+                run.flags.script = devanagari_Script;
+            }
+            else if (!iCmpStr(scr, "Han")) {
+                run.flags.script = han_Script;
+            }
+            else if (!iCmpStr(scr, "Hiragana")) {
+                run.flags.script = hiragana_Script;
+            }
+            else if (!iCmpStr(scr, "Katakana")) {
+                run.flags.script = katakana_Script;
+            }
+            else if (!iCmpStr(scr, "Oriya")) {
+                run.flags.script = oriya_Script;
+            }
+            else if (!iCmpStr(scr, "Tamil")) {
+                run.flags.script = tamil_Script;
+            }
+        }
     }
     if (!isEmpty_Range(&run.logical)) {
         pushBack_Array(&d->runs, &run);
     }
 #if 0
+    const int *logToVis = constData_Array(&d->logicalToVisual);
     printf("[AttributedText] %zu runs:\n", size_Array(&d->runs));
     iConstForEach(Array, i, &d->runs) {
         const iAttributedRun *run = i.value;
@@ -1021,10 +1107,10 @@ struct Impl_RasterGlyph {
     iRect   rect;
 };
 
-static void cacheGlyphs_Font_(iFont *d, const iArray *glyphIndices) {
+static void cacheGlyphs_Font_(iFont *d, const uint32_t *glyphIndices, size_t numGlyphIndices) {
     /* TODO: Make this an object so it can be used sequentially without reallocating buffers. */
     SDL_Surface *buf     = NULL;
-    const iInt2  bufSize = init_I2(iMin(512, d->height * iMin(2 * size_Array(glyphIndices), 20)),
+    const iInt2  bufSize = init_I2(iMin(512, d->height * iMin(2 * numGlyphIndices, 20)),
                                    d->height * 4 / 3);
     int          bufX    = 0;
     iArray *     rasters = NULL;
@@ -1033,9 +1119,9 @@ static void cacheGlyphs_Font_(iFont *d, const iArray *glyphIndices) {
     iAssert(isExposed_Window(get_Window()));
     /* We'll flush the buffered rasters periodically until everything is cached. */
     size_t index = 0;
-    while (index < size_Array(glyphIndices)) {
-        for (; index < size_Array(glyphIndices); index++) {
-            const uint32_t glyphIndex = constValue_Array(glyphIndices, index, uint32_t);
+    while (index < numGlyphIndices) {
+        for (; index < numGlyphIndices; index++) {
+            const uint32_t glyphIndex = glyphIndices[index];
             const int lastCacheBottom = activeText_->cacheBottom;
             iGlyph *glyph = glyphByIndex_Font_(d, glyphIndex);
             if (activeText_->cacheBottom < lastCacheBottom) {
@@ -1137,12 +1223,8 @@ static void cacheGlyphs_Font_(iFont *d, const iArray *glyphIndices) {
     }
 }
 
-static void cacheSingleGlyph_Font_(iFont *d, uint32_t glyphIndex) {
-    iArray indices;
-    init_Array(&indices, sizeof(uint32_t));
-    pushBack_Array(&indices, &glyphIndex);
-    cacheGlyphs_Font_(d, &indices);
-    deinit_Array(&indices);
+iLocalDef void cacheSingleGlyph_Font_(iFont *d, uint32_t glyphIndex) {
+    cacheGlyphs_Font_(d, &glyphIndex, 1);
 }
 
 static void cacheTextGlyphs_Font_(iFont *d, const iRangecc text) {
@@ -1171,7 +1253,7 @@ static void cacheTextGlyphs_Font_(iFont *d, const iRangecc text) {
     }
     deinit_AttributedText(&attrText);
     /* TODO: Cache glyphs from ALL the fonts we encountered above. */
-    cacheGlyphs_Font_(d, &glyphIndices);
+    cacheGlyphs_Font_(d, constData_Array(&glyphIndices), size_Array(&glyphIndices));
     deinit_Array(&glyphIndices);
 }
 
@@ -1380,8 +1462,9 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
         }
         hb_buffer_set_content_type(buf->hb, HB_BUFFER_CONTENT_TYPE_UNICODE);
         hb_buffer_set_direction(buf->hb, HB_DIRECTION_LTR); /* visual */
-        if (run->flags.isArabic) {
-            hb_buffer_set_script(buf->hb, HB_SCRIPT_ARABIC);
+        const hb_script_t script = hbScripts_[run->flags.script];
+        if (script) {
+            hb_buffer_set_script(buf->hb, script);
         }
     }
     if (isMonospaced) {
@@ -1405,6 +1488,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     iBool        isFirst            = iTrue;
     const iBool  checkHitPoint      = wrap && !isEqual_I2(wrap->hitPoint, zero_I2());
     const iBool  checkHitChar       = wrap && wrap->hitChar;
+    size_t       numWrapLines       = 0;
     while (!isEmpty_Range(&wrapRuns)) {
         if (isFirst) {
             isFirst = iFalse;
@@ -1469,8 +1553,11 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                     const float   xOffset    = run->font->xScale * buf->glyphPos[i].x_offset;
                     const float   xAdvance   = run->font->xScale * buf->glyphPos[i].x_advance;
                     const iChar   ch         = logicalText[logPos];
+                    const enum iWrapTextMode wrapMode = isCJK_Script_(run->flags.script)
+                                                              ? anyCharacter_WrapTextMode
+                                                              : args->wrap->mode;
                     iAssert(xAdvance >= 0);
-                    if (args->wrap->mode == word_WrapTextMode) {
+                    if (wrapMode == word_WrapTextMode) {
                         /* When word wrapping, only consider certain places breakable. */
                         if ((prevCh == '-' || prevCh == '/') && !isPunct_Char(ch)) {
                             safeBreakPos = logPos;
@@ -1515,7 +1602,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                             wrapPosRange.end = safeBreakPos;
                         }
                         else {
-                            if (args->wrap->mode == word_WrapTextMode && run->logical.start > wrapPosRange.start) {
+                            if (wrapMode == word_WrapTextMode && run->logical.start > wrapPosRange.start) {
                                 /* Don't have a word break position, so the whole run needs
                                    to be cut. */
                                 wrapPosRange.end = run->logical.start;
@@ -1529,7 +1616,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                             breakRunIndex    = runIndex;
                         }
                         wrapResumePos = wrapPosRange.end;
-                        if (args->wrap->mode != anyCharacter_WrapTextMode) {
+                        if (wrapMode != anyCharacter_WrapTextMode) {
                             while (wrapResumePos < textLen && isSpace_Char(logicalText[wrapResumePos])) {
                                 wrapResumePos++; /* skip space */
                             }
@@ -1634,6 +1721,10 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                               iRound(wrapAdvance))) {
             willAbortDueToWrap = iTrue;
         }
+        numWrapLines++;
+        if (wrap && wrap->maxLines && numWrapLines == wrap->maxLines) {
+            willAbortDueToWrap = iTrue;
+        }
         wrapAttrib = lastAttrib;
         xCursor = origin;
         /* We have determined a possible wrap position and alignment for the work runs,
@@ -1664,12 +1755,13 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                     /* Already handled this part of the run. */
                     continue;
                 }
-                const float xOffset  = run->font->xScale * buf->glyphPos[i].x_offset;
-                const float yOffset  = run->font->yScale * buf->glyphPos[i].y_offset;
-                const float xAdvance = run->font->xScale * buf->glyphPos[i].x_advance;
-                const float yAdvance = run->font->yScale * buf->glyphPos[i].y_advance;
-                const iGlyph *glyph = glyphByIndex_Font_(run->font, glyphId);
-                if (logicalText[logPos] == '\t') {
+                const float   xOffset  = run->font->xScale * buf->glyphPos[i].x_offset;
+                float         yOffset  = run->font->yScale * buf->glyphPos[i].y_offset;
+                const float   xAdvance = run->font->xScale * buf->glyphPos[i].x_advance;
+                const float   yAdvance = run->font->yScale * buf->glyphPos[i].y_advance;
+                const iGlyph *glyph    = glyphByIndex_Font_(run->font, glyphId);
+                const iChar   ch       = logicalText[logPos];
+                if (ch == '\t') {
 #if 0
                     if (mode & draw_RunMode) {
                         /* Tab indicator. */
@@ -1688,6 +1780,13 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                 }
                 const float xf = xCursor + xOffset;
                 const int hoff = enableHalfPixelGlyphs_Text ? (xf - ((int) xf) > 0.5f ? 1 : 0) : 0;
+                if (ch == 0x3001 || ch == 0x3002) {
+                    /* Vertical misalignment?? */
+                    if (yOffset == 0.0f) {
+                        /* Move down to baseline. Why doesn't HarfBuzz do this? */
+                        yOffset = glyph->d[hoff].y + glyph->rect[hoff].size.y + glyph->d[hoff].y / 4;
+                    }
+                }
                 /* Output position for the glyph. */
                 SDL_Rect dst = { orig.x + xCursor + xOffset + glyph->d[hoff].x,
                                  orig.y + yCursor - yOffset + glyph->font->baseline + glyph->d[hoff].y,
@@ -2231,6 +2330,7 @@ void init_TextBuf(iTextBuf *d, iWrapText *wrapText, int font, int color) {
         SDL_Texture *oldTarget = SDL_GetRenderTarget(render);
         const iInt2 oldOrigin = origin_Paint;
         origin_Paint = zero_I2();
+        setBaseAttributes_Text(font, color);
         SDL_SetRenderTarget(render, d->texture);
         SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_NONE);
         SDL_SetRenderDrawColor(render, 255, 255, 255, 0);
@@ -2241,6 +2341,7 @@ void init_TextBuf(iTextBuf *d, iWrapText *wrapText, int font, int color) {
         SDL_SetRenderTarget(render, oldTarget);
         origin_Paint = oldOrigin;
         SDL_SetTextureBlendMode(d->texture, SDL_BLENDMODE_BLEND);
+        setBaseAttributes_Text(-1, -1);
     }
 }
 
diff --git a/src/ui/text.h b/src/ui/text.h
index 63499484..c8bb6f85 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "fontpack.h"
 
+iDeclareType(RegExp)
+
 /* Content sizes: regular (1x) -> medium (1.2x) -> big (1.33x) -> large (1.67x) -> huge (2x) */
 
 #define FONT_ID(name, style, size)    ((name) + ((style) * max_FontSize) + (size))
@@ -159,6 +161,7 @@ enum iAnsiFlag {
 void    setOpacity_Text         (float opacity);
 void    setBaseAttributes_Text  (int fontId, int fgColorId); /* current "normal" text attributes */
 void    setAnsiFlags_Text       (int ansiFlags);
+int     ansiFlags_Text          (void);
 
 void    cache_Text              (int fontId, iRangecc text); /* pre-render glyphs */
 
@@ -190,7 +193,9 @@ struct Impl_TextAttrib {
     int16_t fgColorId;
     int16_t bgColorId;
     struct {
+        uint16_t regular   : 1;
         uint16_t bold      : 1;
+        uint16_t light     : 1;
         uint16_t italic    : 1;
         uint16_t monospace : 1;
         uint16_t isBaseRTL : 1;
@@ -202,6 +207,7 @@ struct Impl_WrapText {
     /* arguments */
     iRangecc    text;
     int         maxWidth;
+    size_t      maxLines; /* 0: unlimited */
     enum iWrapTextMode mode;
     iBool     (*wrapFunc)(iWrapText *, iRangecc wrappedText, iTextAttrib attrib, int origin,
                           int advance);
@@ -229,6 +235,8 @@ enum iTextBlockMode { quadrants_TextBlockMode, shading_TextBlockMode };
 iString *   renderBlockChars_Text   (const iBlock *fontData, int height, enum iTextBlockMode,
                                      const iString *text);
 
+iRegExp *   makeAnsiEscapePattern_Text  (void);
+
 /*-----------------------------------------------------------------------------------------------*/
 
 iDeclareType(TextBuf)
@@ -239,6 +247,5 @@ struct Impl_TextBuf {
     iInt2        size;
 };
 
-iTextBuf *  newRange_TextBuf (int font, int color, iRangecc text);
-
+iTextBuf *  newRange_TextBuf(int font, int color, iRangecc text);
 void        draw_TextBuf    (const iTextBuf *, iInt2 pos, int color);
diff --git a/src/ui/text_simple.c b/src/ui/text_simple.c
index 8560c138..71942cf1 100644
--- a/src/ui/text_simple.c
+++ b/src/ui/text_simple.c
@@ -118,8 +118,9 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             if (match_RegExp(activeText_->ansiEscape, chPos, args->text.end - chPos, &m)) {
                 if (mode & draw_RunMode && ~mode & permanentColorFlag_RunMode) {
                     /* Change the color. */
-                    iColor clr;
-                    ansiColors_Color(capturedRange_RegExpMatch(&m, 1), tmParagraph_ColorId,
+                    iColor clr = get_Color(args->color);
+                    ansiColors_Color(capturedRange_RegExpMatch(&m, 1),
+                                     activeText_->baseFgColorId,
                                      none_ColorId, &clr, NULL);
                     SDL_SetTextureColorMod(activeText_->cache, clr.r, clr.g, clr.b);
                     if (args->mode & fillBackground_RunMode) {
diff --git a/src/ui/touch.c b/src/ui/touch.c
index d6846572..20ccf7b8 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -111,6 +111,7 @@ struct Impl_TouchState {
     double momFrictionPerStep;
     double lastMomTime;
     iInt2 currentTouchPos; /* for emulating SDL_GetMouseState() */
+    iInt2 latestLongPressStartPos;
 };
 
 static iTouchState *touchState_(void) {
@@ -260,6 +261,11 @@ static iFloat3 gestureVector_Touch_(const iTouch *d) {
     return sub_F3(d->pos[0], d->pos[lastIndex]);
 }
 
+static uint32_t gestureSpan_Touch_(const iTouch *d) {
+    const size_t lastIndex = iMin(d->posCount - 1, lastIndex_Touch_);
+    return d->posTime[0] - d->posTime[lastIndex];
+}
+
 static void update_TouchState_(void *ptr) {
     iWindow *win = get_Window();
     const iWidget *oldHover = win->hover;
@@ -308,6 +314,7 @@ static void update_TouchState_(void *ptr) {
             }
             if (!touch->isTapAndHold && nowTime - touch->startTime >= longPressSpanMs_ &&
                 touch->affinity) {
+                touchState_()->latestLongPressStartPos = initF3_I2(touch->pos[0]);
                 dispatchClick_Touch_(touch, SDL_BUTTON_RIGHT);
                 touch->isTapAndHold = iTrue;
                 touch->hasMoved = iFalse;
@@ -593,9 +600,18 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                     divvf_F3(&touch->accum, 6);
                     divfv_I2(&pixels, 6);
                     /* Allow scrolling a scrollable widget. */
-                    iWidget *flow = findOverflowScrollable_Widget(touch->affinity);
-                    if (flow) {
-                        touch->affinity = flow;
+                    if (touch->affinity && touch->affinity->flags2 & slidingSheetDraggable_WidgetFlag2) {
+                        extern iWidgetClass Class_SidebarWidget; /* The only type of sliding sheet for now. */
+                        iWidget *slider = findParentClass_Widget(touch->affinity, &Class_SidebarWidget);
+                        if (slider) {
+                            touch->affinity = slider;
+                        }
+                    }
+                    else {
+                        iWidget *flow = findOverflowScrollable_Widget(touch->affinity);
+                        if (flow) {
+                            touch->affinity = flow;
+                        }
                     }
                 }
                 else {
@@ -621,11 +637,13 @@ iBool processEvent_Touch(const SDL_Event *ev) {
             if (touch->axis == y_TouchAxis) {
                 pixels.x = 0;
             }
-//            printf("%p (%s) py: %i wy: %f acc: %f edge: %d\n",
-//                   touch->affinity,
-//                   class_Widget(touch->affinity)->name,
-//                   pixels.y, y_F3(amount), y_F3(touch->accum),
-//                   touch->edge);
+#if 0
+            printf("%p (%s) py: %i wy: %f acc: %f edge: %d\n",
+                   touch->affinity,
+                   class_Widget(touch->affinity)->name,
+                   pixels.y, y_F3(amount), y_F3(touch->accum),
+                   touch->edge);
+#endif
             if (pixels.x || pixels.y) {
                 //setFocus_Widget(NULL);
                 dispatchMotion_Touch_(touch->startPos /*pos[0]*/, 0);
@@ -661,11 +679,14 @@ iBool processEvent_Touch(const SDL_Event *ev) {
 #endif
             if (touch->edge && !isStationary_Touch_(touch)) {
                 const iFloat3 gesture = gestureVector_Touch_(touch);
+                const uint32_t duration = gestureSpan_Touch_(touch);
                 const float pixel = window->pixelRatio;
                 const int moveDir = x_F3(gesture) < -pixel ? -1 : x_F3(gesture) > pixel ? +1 : 0;
                 const int didAbort = (touch->edge == left_TouchEdge  && moveDir < 0) ||
                                      (touch->edge == right_TouchEdge && moveDir > 0);
-                postCommandf_App("edgeswipe.ended abort:%d side:%d id:%llu", didAbort, touch->edge, touch->id);
+                postCommandf_App("edgeswipe.ended abort:%d side:%d id:%llu speed:%d", didAbort,
+                                 touch->edge, touch->id,
+                                 (int) (duration > 0 ? length_F3(gesture) / (duration / 1000.0f) : 0));
                 remove_ArrayIterator(&i);
                 continue;
             }
@@ -689,8 +710,8 @@ iBool processEvent_Touch(const SDL_Event *ev) {
             }
             /* Edge swipes do not generate momentum. */
             const size_t lastIndex = iMin(touch->posCount - 1, lastIndex_Touch_);
-            const uint32_t duration = nowTime - touch->startTime;
             const iFloat3 gestureVector = sub_F3(pos, touch->pos[lastIndex]);
+            const uint32_t duration = nowTime - touch->startTime;
             iFloat3 velocity = zero_F3();
 #if 0
             if (touch->edge && fabsf(2 * x_F3(gestureVector)) > fabsf(y_F3(gestureVector)) &&
@@ -805,10 +826,24 @@ void widgetDestroyed_Touch(iWidget *widget) {
     }
 }
 
+void transferAffinity_Touch(iWidget *src, iWidget *dst) {
+    iTouchState *d = touchState_();
+    iForEach(Array, i, d->touches) {
+        iTouch *touch = i.value;
+        if (touch->affinity == src) {
+            touch->affinity = dst;
+        }
+    }
+}
+
 iInt2 latestPosition_Touch(void) {
     return touchState_()->currentTouchPos;
 }
 
+iInt2 latestTapPosition_Touch(void) {
+    return touchState_()->latestLongPressStartPos;
+}
+
 iBool isHovering_Touch(void) {
     iTouchState *d = touchState_();
     if (numFingers_Touch() == 1) {
diff --git a/src/ui/touch.h b/src/ui/touch.h
index e048224a..15c6da1f 100644
--- a/src/ui/touch.h
+++ b/src/ui/touch.h
@@ -36,10 +36,12 @@ enum iWidgetTouchMode {
 iBool   processEvent_Touch      (const SDL_Event *);
 void    update_Touch            (void);
 
-float                   stopWidgetMomentum_Touch    (const iWidget *widget);
+float                   stopWidgetMomentum_Touch    (const iWidget *widget); /* pixels per second */
 enum iWidgetTouchMode   widgetMode_Touch            (const iWidget *widget);
 void                    widgetDestroyed_Touch       (iWidget *widget);
+void                    transferAffinity_Touch      (iWidget *src, iWidget *dst);
 
 iInt2   latestPosition_Touch    (void); /* valid during processing of current event */
+iInt2   latestTapPosition_Touch (void);
 iBool   isHovering_Touch        (void); /* stationary touch or a long-press drag ongoing */
 size_t  numFingers_Touch        (void);
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index bad00071..ed448768 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -56,8 +56,10 @@ struct Impl_UploadWidget {
     iDocumentWidget *viewer;
     iGmRequest *     request;
     iLabelWidget *   info;
+    iInputWidget *   path;
     iInputWidget *   mime;
     iInputWidget *   token;
+    iLabelWidget *   ident;       
     iInputWidget *   input;
     iLabelWidget *   filePathLabel;
     iLabelWidget *   fileSizeLabel;
@@ -91,17 +93,19 @@ static void updateProgress_UploadWidget_(iGmRequest *request, size_t current, si
 static void updateInputMaxHeight_UploadWidget_(iUploadWidget *d) {
     iWidget *w = as_Widget(d);    
     /* Calculate how many lines fits vertically in the view. */
-    const iInt2 inputPos     = topLeft_Rect(bounds_Widget(as_Widget(d->input)));
-    const int   footerHeight = isUsingPanelLayout_Mobile() ? 0 :
-                                (height_Widget(d->token) +
-                                 height_Widget(findChild_Widget(w, "dialogbuttons")) +
-                                 12 * gap_UI);
-    const int   avail        = bottom_Rect(safeRect_Root(w->root)) - footerHeight -
-                               get_MainWindow()->keyboardHeight;
-    setLineLimits_InputWidget(d->input,
-                              minLines_InputWidget(d->input),
-                              iMaxi(minLines_InputWidget(d->input),
-                                    (avail - inputPos.y) / lineHeight_Text(font_InputWidget(d->input))));
+    const iInt2 inputPos = topLeft_Rect(bounds_Widget(as_Widget(d->input)));
+    int footerHeight = 0;
+    if (!isUsingPanelLayout_Mobile()) {
+        footerHeight = (height_Widget(d->token) +
+                        height_Widget(findChild_Widget(w, "dialogbuttons")) +
+                        12 * gap_UI);
+    }
+    const int avail = bottom_Rect(visibleRect_Root(w->root)) - footerHeight - inputPos.y;
+    /* On desktop, retain the previously set minLines value. */
+    int minLines = isUsingPanelLayout_Mobile() ? 1 : minLines_InputWidget(d->input);
+    int maxLines = iMaxi(minLines, avail / lineHeight_Text(font_InputWidget(d->input)));
+    /* On mobile, the height is fixed to the available space. */
+    setLineLimits_InputWidget(d->input, isUsingPanelLayout_Mobile() ? maxLines : minLines, maxLines);
 }
 
 static const iGmIdentity *titanIdentityForUrl_(const iString *url) {
@@ -123,9 +127,15 @@ static const iArray *makeIdentityItems_UploadWidget_(const iUploadWidget *d) {
     pushBack_Array(items, &(iMenuItem){ "---" });
     iConstForEach(PtrArray, i, listIdentities_GmCerts(certs_App(), NULL, NULL)) {
         const iGmIdentity *id = i.ptr;
+        iString *str = collect_String(copy_String(name_GmIdentity(id)));
+        prependCStr_String(str, "\x1b[1m");
+        if (!isEmpty_String(&id->notes)) {
+            appendFormat_String(
+                str, "\x1b[0m\n%s%s", escape_Color(uiTextDim_ColorId), cstr_String(&id->notes));
+        }
         pushBack_Array(
             items,
-            &(iMenuItem){ cstr_String(name_GmIdentity(id)), 0, 0,
+            &(iMenuItem){ cstr_String(str), 0, 0,
                           format_CStr("upload.setid fp:%s",
                                       cstrCollect_String(hexEncode_Block(&id->fingerprint))) });
     }
@@ -182,15 +192,20 @@ void init_UploadWidget(iUploadWidget *d) {
         };
         initPanels_Mobile(w, NULL, (iMenuItem[]){
             { "title id:heading.upload" },
-            { "label id:upload.info" },
+            { "heading id:upload.url" },
+            { format_CStr("label id:upload.info font:%d",
+                          deviceType_App() == phone_AppDeviceType ? uiLabelBig_FontId : uiLabelMedium_FontId) },
+            { "input id:upload.path hint:hint.upload.path noheading:1 url:1 text:" },
+            { "heading text:${heading.upload.id}" },
+            { "dropdown id:upload.id icon:0x1f464 text:", 0, 0, constData_Array(makeIdentityItems_UploadWidget_(d)) },
+            { "input id:upload.token hint:hint.upload.token.long icon:0x1f516 text:" },
+            { "heading id:upload.content" },
             { "panel id:dlg.upload.text icon:0x1f5b9 noscroll:1", 0, 0, (const void *) textItems },
             { "panel id:dlg.upload.file icon:0x1f4c1", 0, 0, (const void *) fileItems },
-            { "padding" },
-            { "dropdown id:upload.id icon:0x1f464", 0, 0, constData_Array(makeIdentityItems_UploadWidget_(d)) },
-            { "input id:upload.token hint:hint.upload.token icon:0x1f511" },
             { NULL }
         }, actions, iElemCount(actions));
         d->info          = findChild_Widget(w, "upload.info");
+        d->path          = findChild_Widget(w, "upload.path");
         d->input         = findChild_Widget(w, "upload.text");
         d->filePathLabel = findChild_Widget(w, "upload.filepathlabel");
         d->fileSizeLabel = findChild_Widget(w, "upload.filesizelabel");
@@ -200,17 +215,28 @@ void init_UploadWidget(iUploadWidget *d) {
         if (isPortraitPhone_App()) {
             enableUploadButton_UploadWidget_(d, iFalse);
         }
+        iWidget *title = findChild_Widget(w, "heading.upload.text");
+        iLabelWidget *menu = new_LabelWidget(midEllipsis_Icon, "upload.editmenu.open");
+        setTextColor_LabelWidget(menu, uiTextAction_ColorId);
+        setFont_LabelWidget(menu, uiLabelBigBold_FontId);
+        addChildFlags_Widget(title, iClob(menu), frameless_WidgetFlag | moveToParentRightEdge_WidgetFlag);
     }
     else {
         useSheetStyle_Widget(w);
         setFlags_Widget(w, overflowScrollable_WidgetFlag, iFalse);
-        addChildFlags_Widget(w,
-                             iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.upload}", NULL)),
-                             frameless_WidgetFlag);
-        d->info = addChildFlags_Widget(w, iClob(new_LabelWidget("", NULL)),
-                                       frameless_WidgetFlag | resizeToParentWidth_WidgetFlag |
-                                       fixedHeight_WidgetFlag);
-        setWrap_LabelWidget(d->info, iTrue);
+        addDialogTitle_Widget(w, "${heading.upload}", NULL);
+        iWidget *headings, *values;
+        /* URL path. */ {
+            iWidget *page = makeTwoColumns_Widget(&headings, &values);
+            d->path = new_InputWidget(0);
+            addTwoColumnDialogInputField_Widget(
+                headings, values, "", "upload.path", iClob(d->path));
+            d->info = (iLabelWidget *) lastChild_Widget(headings);
+            setFont_LabelWidget(d->info, uiContent_FontId);
+            setTextColor_LabelWidget(d->info, uiInputTextFocused_ColorId);
+            addChild_Widget(w, iClob(page));
+            addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
+        }
         /* Tabs for input data. */
         iWidget *tabs = makeTabs_Widget(w);
         /* Make the tabs support vertical expansion based on content. */ {
@@ -220,7 +246,6 @@ void init_UploadWidget(iUploadWidget *d) {
             setFlags_Widget(tabPages, resizeHeightOfChildren_WidgetFlag, iFalse);
             setFlags_Widget(tabPages, arrangeHeight_WidgetFlag, iTrue);
         }
-        iWidget *headings, *values;
         setBackgroundColor_Widget(findChild_Widget(tabs, "tabs.buttons"), uiBackgroundSidebar_ColorId);
         setId_Widget(tabs, "upload.tabs");
         /* Text input. */ {
@@ -233,7 +258,8 @@ void init_UploadWidget(iUploadWidget *d) {
             appendFramelessTabPage_Widget(tabs, iClob(page), "${heading.upload.text}", '1', 0);
         }
         /* File content. */ {
-            appendTwoColumnTabPage_Widget(tabs, "${heading.upload.file}", '2', &headings, &values);        
+            iWidget *page = appendTwoColumnTabPage_Widget(tabs, "${heading.upload.file}", '2', &headings, &values);
+            setBackgroundColor_Widget(page, uiBackgroundSidebar_ColorId);
             addChildFlags_Widget(headings, iClob(new_LabelWidget("${upload.file.name}", NULL)), frameless_WidgetFlag);
             d->filePathLabel = addChildFlags_Widget(values, iClob(new_LabelWidget(uiTextAction_ColorEscape "${upload.file.drophere}", NULL)), frameless_WidgetFlag);
             addChildFlags_Widget(headings, iClob(new_LabelWidget("${upload.file.size}", NULL)), frameless_WidgetFlag);
@@ -245,19 +271,20 @@ void init_UploadWidget(iUploadWidget *d) {
         /* Identity and Token. */ {
             addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
             iWidget *page = makeTwoColumns_Widget(&headings, &values);
-            /* Token. */
-            d->token = addTwoColumnDialogInputField_Widget(
-                headings, values, "${upload.token}", "upload.token", iClob(new_InputWidget(0)));
-            setHint_InputWidget(d->token, "${hint.upload.token}");
-            setFixedSize_Widget(as_Widget(d->token), init_I2(50 * gap_UI, -1));            
             /* Identity. */
             const iArray *   identItems = makeIdentityItems_UploadWidget_(d);
             const iMenuItem *items      = constData_Array(identItems);
             const size_t     numItems   = size_Array(identItems);
-            iLabelWidget *   ident      = makeMenuButton_LabelWidget("${upload.id}", items, numItems);
-            setTextCStr_LabelWidget(ident, items[findWidestLabel_MenuItem(items, numItems)].label);
+            d->ident                    = makeMenuButton_LabelWidget("${upload.id}", items, numItems);
+            setTextCStr_LabelWidget(d->ident, items[findWidestLabel_MenuItem(items, numItems)].label);
+            //setFixedSize_Widget(as_Widget(d->ident), init_I2(50 * gap_UI, ));
             addChild_Widget(headings, iClob(makeHeading_Widget("${upload.id}")));
-            setId_Widget(addChildFlags_Widget(values, iClob(ident), alignLeft_WidgetFlag), "upload.id");
+            setId_Widget(addChildFlags_Widget(values, iClob(d->ident), alignLeft_WidgetFlag), "upload.id");
+            /* Token. */
+            d->token = addTwoColumnDialogInputField_Widget(
+                headings, values, "${upload.token}", "upload.token", iClob(new_InputWidget(0)));
+            setHint_InputWidget(d->token, "${hint.upload.token}");
+            setFixedSize_Widget(as_Widget(d->token), init_I2(50 * gap_UI, -1));            
             addChild_Widget(w, iClob(page));
         }
         /* Buttons. */ {
@@ -272,7 +299,12 @@ void init_UploadWidget(iUploadWidget *d) {
         }
         resizeToLargestPage_Widget(tabs);
         arrange_Widget(w);
+        setFixedSize_Widget(as_Widget(d->path),  init_I2(width_Widget(tabs) - width_Widget(d->info), -1));
+        setFixedSize_Widget(as_Widget(d->mime),  init_I2(width_Widget(tabs) - 3 * gap_UI -
+                                                            left_Rect(parent_Widget(d->mime)->rect), -1));
         setFixedSize_Widget(as_Widget(d->token), init_I2(width_Widget(tabs) - left_Rect(parent_Widget(d->token)->rect), -1));
+        setFixedSize_Widget(as_Widget(d->ident), init_I2(width_Widget(d->token),
+                                                         lineHeight_Text(uiLabel_FontId) + 2 * gap_UI));
         setFlags_Widget(as_Widget(d->token), expand_WidgetFlag, iTrue);
         setFocus_Widget(as_Widget(d->input));
     }
@@ -339,8 +371,24 @@ static void setUrlPort_UploadWidget_(iUploadWidget *d, const iString *url, uint1
     appendRange_String(&d->url, (iRangecc){ parts.scheme.end, parts.host.end });
     appendFormat_String(&d->url, ":%u", overridePort ? overridePort : titanPortForUrl_(url));
     appendRange_String(&d->url, (iRangecc){ parts.path.start, constEnd_String(url) });
-    setText_LabelWidget(d->info, &d->url);
-    arrange_Widget(as_Widget(d));
+    const iRangecc siteRoot = urlRoot_String(&d->url);
+    setTextCStr_LabelWidget(d->info, cstr_Rangecc((iRangecc){ urlHost_String(&d->url).start,
+                                                              siteRoot.end }));
+    /* From root onwards, the URL is editable. */
+    setTextCStr_InputWidget(d->path,
+                            cstr_Rangecc((iRangecc){ siteRoot.end, constEnd_String(&d->url) }));
+    if (!cmp_String(text_InputWidget(d->path), "/")) {
+        setTextCStr_InputWidget(d->path, ""); /* might as well show the hint */
+    }
+    if (isUsingPanelLayout_Mobile()) {
+        arrange_Widget(as_Widget(d)); /* a wrapped label */
+    }
+    else {
+        setFixedSize_Widget(as_Widget(d->path),
+                            init_I2(width_Widget(findChild_Widget(as_Widget(d), "upload.tabs")) -
+                                        width_Widget(d->info),
+                                    -1));
+    }
 }
 
 void setUrl_UploadWidget(iUploadWidget *d, const iString *url) {
@@ -353,6 +401,10 @@ void setResponseViewer_UploadWidget(iUploadWidget *d, iDocumentWidget *doc) {
     d->viewer = doc;
 }
 
+void setText_UploadWidget(iUploadWidget *d, const iString *text) {
+    setText_InputWidget(findChild_Widget(as_Widget(d), "upload.text"), text);    
+}
+
 static iWidget *acceptButton_UploadWidget_(iUploadWidget *d) {
     return lastChild_Widget(findChild_Widget(as_Widget(d), "dialogbuttons"));
 }
@@ -396,6 +448,18 @@ static void showOrHideUploadButton_UploadWidget_(iUploadWidget *d) {
     }
 }
 
+static const iString *requestUrl_UploadWidget_(const iUploadWidget *d) {
+    const iRangecc siteRoot = urlRoot_String(&d->url);
+    iString *reqUrl = collectNew_String();
+    setRange_String(reqUrl, (iRangecc){ constBegin_String(&d->url), siteRoot.end });
+    const iString *path = text_InputWidget(d->path);
+    if (!startsWith_String(path, "/")) {
+        appendCStr_String(reqUrl, "/");
+    }
+    append_String(reqUrl, path);
+    return reqUrl;
+}
+
 static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     const char *cmd = command_UserEvent(ev);
@@ -405,8 +469,22 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
     }
     else if (equal_Command(cmd, "panel.changed")) {
         showOrHideUploadButton_UploadWidget_(d);
+        if (currentPanelIndex_Mobile(w) == 0) {
+            setFocus_Widget(as_Widget(d->input));
+        }
+        else {
+            setFocus_Widget(NULL);
+        }
+        refresh_Widget(d->input);
+        return iFalse;
+    }
+#if defined (iPlatformAppleMobile)
+    else if (deviceType_App() != desktop_AppDeviceType && equal_Command(cmd, "menu.opened")) {
+        setFocus_Widget(NULL); /* overlaid text fields! */
+        refresh_Widget(d->input);
         return iFalse;
     }
+#endif
     else if (equal_Command(cmd, "upload.cancel")) {
         setupSheetTransition_Mobile(w, iFalse);
         destroy_Widget(w);
@@ -444,6 +522,43 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         updateIdentityDropdown_UploadWidget_(d);
         return iTrue;
     }
+    if (isCommand_Widget(w, ev, "upload.editmenu.open")) {
+        setFocus_Widget(NULL);
+        refresh_Widget(as_Widget(d->input));
+        iWidget *editMenu = makeMenu_Widget(root_Widget(w), (iMenuItem[]){
+            { select_Icon " ${menu.selectall}", 0, 0, "upload.text.selectall" },
+            { export_Icon " ${menu.upload.export}", 0, 0, "upload.text.export" },
+            { "---" },
+            { delete_Icon " " uiTextCaution_ColorEscape "${menu.upload.delete}", 0, 0, "upload.text.delete" }
+        }, 4);
+        openMenu_Widget(editMenu, topLeft_Rect(bounds_Widget(as_Widget(d->input))));
+        return iTrue;
+    }
+    if (isCommand_UserEvent(ev, "upload.text.export")) {
+#if defined (iPlatformAppleMobile)
+        openTextActivityView_iOS(text_InputWidget(d->input));
+#endif
+        return iTrue;
+    }
+    if (isCommand_UserEvent(ev, "upload.text.delete")) {
+        if (argLabel_Command(command_UserEvent(ev), "confirmed")) {
+            setTextCStr_InputWidget(d->input, "");
+            setFocus_Widget(as_Widget(d->input));
+        }
+        else {
+            openMenu_Widget(makeMenu_Widget(root_Widget(w), (iMenuItem[]){
+                { delete_Icon " " uiTextCaution_ColorEscape "${menu.upload.delete.confirm}", 0, 0,
+                    "upload.text.delete confirmed:1" }
+            }, 1), zero_I2());
+        }
+        return iTrue;
+    }
+    if (isCommand_UserEvent(ev, "upload.text.selectall")) {
+        setFocus_Widget(as_Widget(d->input));
+        refresh_Widget(as_Widget(d->input));
+        postCommand_Widget(d->input, "input.selectall");
+        return iTrue;
+    }
     if (isCommand_Widget(w, ev, "upload.accept")) {
         iBool isText;
         iWidget *tabs = findChild_Widget(w, "upload.tabs");
@@ -464,7 +579,7 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         d->request = new_GmRequest(certs_App());
         setSendProgressFunc_GmRequest(d->request, updateProgress_UploadWidget_);
         setUserData_Object(d->request, d);
-        setUrl_GmRequest(d->request, &d->url);
+        setUrl_GmRequest(d->request, requestUrl_UploadWidget_(d));
         const iString     *site    = collectNewRange_String(urlRoot_String(&d->url));
         switch (d->idMode) {
             case none_UploadIdentity:
@@ -540,10 +655,15 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         return iTrue;        
     }
     else if (isCommand_Widget(w, ev, "input.resized")) {
-        resizeToLargestPage_Widget(findChild_Widget(w, "upload.tabs"));
-        arrange_Widget(w);
-        refresh_Widget(w);
-        return iTrue;
+        if (!isUsingPanelLayout_Mobile()) {
+            resizeToLargestPage_Widget(findChild_Widget(w, "upload.tabs"));
+            arrange_Widget(w);
+            refresh_Widget(w);
+            return iTrue;
+        }
+        else {
+            refresh_Widget(as_Widget(d->input));
+        }
     }
     else if (isCommand_Widget(w, ev, "upload.pickfile")) {
 #if defined (iPlatformAppleMobile)
diff --git a/src/ui/uploadwidget.h b/src/ui/uploadwidget.h
index 5a7de45e..1cc1f193 100644
--- a/src/ui/uploadwidget.h
+++ b/src/ui/uploadwidget.h
@@ -31,3 +31,4 @@ iDeclareType(DocumentWidget)
     
 void    setUrl_UploadWidget             (iUploadWidget *, const iString *url);
 void    setResponseViewer_UploadWidget  (iUploadWidget *, iDocumentWidget *doc);
+void    setText_UploadWidget            (iUploadWidget *, const iString *text);
diff --git a/src/ui/util.c b/src/ui/util.c
index 912e1d37..31907721 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -479,12 +479,15 @@ void init_SmoothScroll(iSmoothScroll *d, iWidget *owner, iSmoothScrollNotifyFunc
     reset_SmoothScroll(d);
     d->widget = owner;
     d->notify = notify;
+    d->pullActionTriggered = 0;
+    d->flags = 0;
 }
 
 void reset_SmoothScroll(iSmoothScroll *d) {
     init_Anim(&d->pos, 0);
     d->max = 0;
     d->overscroll = (deviceType_App() != desktop_AppDeviceType ? 100 * gap_UI : 0);
+    d->pullActionTriggered = 0;
 }
 
 void setMax_SmoothScroll(iSmoothScroll *d, int max) {
@@ -518,6 +521,29 @@ iBool isFinished_SmoothScroll(const iSmoothScroll *d) {
     return isFinished_Anim(&d->pos);
 }
 
+iLocalDef int pullActionThreshold_SmoothScroll_(const iSmoothScroll *d) {
+    return d->overscroll * 6 / 10;
+}
+
+float pullActionPos_SmoothScroll(const iSmoothScroll *d) {
+    if (d->pullActionTriggered >= 1) {
+        return 1.0f;
+    }
+    float pos = overscroll_SmoothScroll_(d);
+    if (pos >= 0.0f) {
+        return 0.0f;
+    }
+    pos = -pos / (float) pullActionThreshold_SmoothScroll_(d);
+    return iMin(pos, 1.0f);
+}
+
+static void checkPullAction_SmoothScroll_(iSmoothScroll *d) {
+    if (d->pullActionTriggered == 1 && d->widget) {
+        postCommand_Widget(d->widget, "pullaction");
+        d->pullActionTriggered = 2; /* pending handling */
+    }
+}
+
 void moveSpan_SmoothScroll(iSmoothScroll *d, int offset, uint32_t span) {
 #if !defined (iPlatformMobile)
     if (!prefs_App()->smoothScrolling) {
@@ -525,16 +551,19 @@ void moveSpan_SmoothScroll(iSmoothScroll *d, int offset, uint32_t span) {
     }
 #endif
     int destY = targetValue_Anim(&d->pos) + offset;
+    if (d->flags & pullDownAction_SmoothScrollFlag && destY < -pullActionThreshold_SmoothScroll_(d)) {
+        if (d->pullActionTriggered == 0) {
+            d->pullActionTriggered = iTrue;
+#if defined (iPlatformAppleMobile)
+            playHapticEffect_iOS(tap_HapticEffect);
+#endif
+        }
+    }
     if (destY < -d->overscroll) {
         destY = -d->overscroll;
     }
-    if (d->max > 0) {
-        if (destY >= d->max + d->overscroll) {
-            destY = d->max + d->overscroll;
-        }
-    }
-    else {
-        destY = 0;
+    if (destY >= d->max + d->overscroll) {
+        destY = d->max + d->overscroll;
     }
     if (span) {
         setValueEased_Anim(&d->pos, destY, span);
@@ -552,6 +581,7 @@ void moveSpan_SmoothScroll(iSmoothScroll *d, int offset, uint32_t span) {
             //            printf("remaining: %f  dur: %d\n", remaining, duration);
             d->pos.bounce = (osDelta < 0 ? -1 : 1) *
                             iMini(5 * d->overscroll, remaining * remaining * 0.00005f);
+            checkPullAction_SmoothScroll_(d);
         }
     }
     if (d->notify) {
@@ -570,6 +600,7 @@ iBool processEvent_SmoothScroll(iSmoothScroll *d, const SDL_Event *ev) {
             moveSpan_SmoothScroll(d, -osDelta, 100 * sqrt(iAbs(osDelta) / gap_UI));
             d->pos.flags = easeOut_AnimFlag | muchSofter_AnimFlag;
         }
+        checkPullAction_SmoothScroll_(d);
         return iTrue;
     }
     return iFalse;
@@ -620,7 +651,7 @@ static iBool isCommandIgnoredByMenus_(const char *cmd) {
     if (equal_Command(cmd, "window.focus.lost") ||
         equal_Command(cmd, "window.focus.gained")) return iTrue;
     /* TODO: Perhaps a common way of indicating which commands are notifications and should not
-       be reacted to by menus? */
+       be reacted to by menus?! */
     return equal_Command(cmd, "media.updated") ||
            equal_Command(cmd, "media.player.update") ||
            startsWith_CStr(cmd, "feeds.update.") ||
@@ -640,13 +671,16 @@ static iBool isCommandIgnoredByMenus_(const char *cmd) {
            equal_Command(cmd, "window.reload.update") ||
            equal_Command(cmd, "window.mouse.exited") ||
            equal_Command(cmd, "window.mouse.entered") ||
+           equal_Command(cmd, "input.backup") ||
+           equal_Command(cmd, "input.ended") ||
+           equal_Command(cmd, "focus.lost") ||
            (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
 }
 
 static iLabelWidget *parentMenuButton_(const iWidget *menu) {
     if (isInstance_Object(menu->parent, &Class_LabelWidget)) {
         iLabelWidget *button = (iLabelWidget *) menu->parent;
-        if (!cmp_String(command_LabelWidget(button), "menu.open")) {
+        if (equal_Command(cstr_String(command_LabelWidget(button)), "menu.open")) {
             return button;
         }
     }
@@ -671,6 +705,21 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
             closeMenu_Widget(menu);
             return iTrue;
         }
+        if (equal_Command(cmd, "cancel") && pointerLabel_Command(cmd, "menu") == menu) {
+            return iFalse;
+        }
+        if (equal_Command(cmd, "contextclick") && pointer_Command(cmd) == menu) {
+            return iFalse;
+        }
+        if (deviceType_App() == phone_AppDeviceType && equal_Command(cmd, "keyboard.changed") &&
+            arg_Command(cmd) == 0) {
+            /* May need to reposition the menu. */
+            menu->rect.pos = windowToLocal_Widget(
+                menu,
+                init_I2(left_Rect(bounds_Widget(menu)),
+                        bottom_Rect(safeRect_Root(menu->root)) - menu->rect.size.y));
+            return iFalse;
+        }
         if (!isCommandIgnoredByMenus_(cmd)) {
             closeMenu_Widget(menu);
         }
@@ -733,13 +782,16 @@ void makeMenuItems_Widget(iWidget *menu, const iMenuItem *items, size_t n) {
                 noBackground_WidgetFlag | frameless_WidgetFlag | alignLeft_WidgetFlag |
                 drawKey_WidgetFlag | itemFlags);
             setWrap_LabelWidget(label, isInfo);
+            if (!isInfo) {
             haveIcons |= checkIcon_LabelWidget(label);
-            updateSize_LabelWidget(label); /* drawKey was set */
+            }
             setFlags_Widget(as_Widget(label), disabled_WidgetFlag, isDisabled);
             if (isInfo) {
-                setFlags_Widget(as_Widget(label), fixedHeight_WidgetFlag, iTrue); /* wrap changes height */
+                setFlags_Widget(as_Widget(label), resizeToParentWidth_WidgetFlag |
+                                fixedHeight_WidgetFlag, iTrue); /* wrap changes height */
                 setTextColor_LabelWidget(label, uiTextAction_ColorId);
             }
+            updateSize_LabelWidget(label); /* drawKey was set */
         }
     }
     if (deviceType_App() == phone_AppDeviceType) {
@@ -861,12 +913,8 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
     setFlags_Widget(menu,
                     keepOnTop_WidgetFlag | collapse_WidgetFlag | hidden_WidgetFlag |
                         arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
-                        resizeChildrenToWidestChild_WidgetFlag | overflowScrollable_WidgetFlag |
-                        (isPortraitPhone_App() ? drawBackgroundToVerticalSafeArea_WidgetFlag : 0),
+                        resizeChildrenToWidestChild_WidgetFlag | overflowScrollable_WidgetFlag,
                     iTrue);
-    if (!isPortraitPhone_App()) {
-        setFrameColor_Widget(menu, uiBackgroundSelected_ColorId);
-    }
     makeMenuItems_Widget(menu, items, n);
     addChild_Widget(parent, menu);
     iRelease(menu); /* owned by parent now */
@@ -884,6 +932,7 @@ void openMenu_Widget(iWidget *d, iInt2 windowCoord) {
 
 static void updateMenuItemFonts_Widget_(iWidget *d) {
     const iBool isPortraitPhone = (deviceType_App() == phone_AppDeviceType && isPortrait_App());
+    const iBool isMobile        = (deviceType_App() != desktop_AppDeviceType);
     const iBool isSlidePanel    = (flags_Widget(d) & horizontalOffset_WidgetFlag) != 0;
     iForEach(ObjectList, i, children_Widget(d)) {
         if (isInstance_Object(i.object, &Class_LabelWidget)) {
@@ -892,16 +941,16 @@ static void updateMenuItemFonts_Widget_(iWidget *d) {
             if (isWrapped_LabelWidget(label)) {
                 continue;
             }
-            if (deviceType_App() == desktop_AppDeviceType) {
+            switch (deviceType_App()) {
+                case desktop_AppDeviceType:
                 setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
-            }
-            else if (isPortraitPhone) {
-                if (!isSlidePanel) {
+                    break;
+                case tablet_AppDeviceType:
+                    setFont_LabelWidget(label, isCaution ? uiLabelMediumBold_FontId : uiLabelMedium_FontId);
+                    break;
+                case phone_AppDeviceType:
                     setFont_LabelWidget(label, isCaution ? uiLabelBigBold_FontId : uiLabelBig_FontId);
-                }
-            }
-            else {
-                setFont_LabelWidget(label, isCaution ? uiContentBold_FontId : uiContent_FontId);
+                    break;
             }
         }
         else if (childCount_Widget(i.object)) {
@@ -1024,20 +1073,28 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
 #else
     const iRect rootRect        = rect_Root(d->root);
     const iInt2 rootSize        = rootRect.size;
-    const iBool isPortraitPhone = (deviceType_App() == phone_AppDeviceType && isPortrait_App());
+    const iBool isPhone         = (deviceType_App() == phone_AppDeviceType);
+    const iBool isPortraitPhone = (isPhone && isPortrait_App());
     const iBool isSlidePanel    = (flags_Widget(d) & horizontalOffset_WidgetFlag) != 0;
     if (postCommands) {
-        postCommand_App("cancel"); /* dismiss any other menus */
+        postCommandf_App("cancel menu:%p", d); /* dismiss any other menus */
     }
     /* Menu closes when commands are emitted, so handle any pending ones beforehand. */
     processEvents_App(postedEventsOnly_AppEventMode);
     setFlags_Widget(d, hidden_WidgetFlag, iFalse);
     setFlags_Widget(d, commandOnMouseMiss_WidgetFlag, iTrue);
     setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iFalse);
+    if (!isPortraitPhone) {   
+        setFrameColor_Widget(d, uiBackgroundSelected_ColorId);
+    }
+    else {
+        setFrameColor_Widget(d, none_ColorId);
+    }
     arrange_Widget(d); /* need to know the height */
     iBool allowOverflow = iFalse;
     /* A vertical offset determined by a possible selected label in the menu. */ 
-    if (windowCoord.y < rootSize.y - lineHeight_Text(uiNormal_FontSize) * 3) {
+    if (deviceType_App() == desktop_AppDeviceType &&
+        windowCoord.y < rootSize.y - lineHeight_Text(uiNormal_FontSize) * 3) {
         iConstForEach(ObjectList, child, children_Widget(d)) {
             const iWidget *item = constAs_Widget(child.object);
             if (flags_Widget(item) & selected_WidgetFlag) {
@@ -1104,22 +1161,35 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
     }
 #endif
     raise_Widget(d);
-    if (isPortraitPhone) {
-        setFlags_Widget(d, arrangeWidth_WidgetFlag | resizeChildrenToWidestChild_WidgetFlag, iFalse);
-        setFlags_Widget(d, resizeWidthOfChildren_WidgetFlag | drawBackgroundToBottom_WidgetFlag, iTrue);
-        if (!isSlidePanel) {
-            setFlags_Widget(d, borderTop_WidgetFlag, iTrue);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        setFlags_Widget(d, arrangeWidth_WidgetFlag | resizeChildrenToWidestChild_WidgetFlag, 
+                        !isPhone);
+        setFlags_Widget(d,
+                        resizeWidthOfChildren_WidgetFlag | drawBackgroundToBottom_WidgetFlag |
+                            drawBackgroundToVerticalSafeArea_WidgetFlag,
+                        isPhone);
+        if (isPhone) {
+            setFlags_Widget(d, borderTop_WidgetFlag, !isSlidePanel && isPortrait_App()); /* menu is otherwise frameless */
+            setFixedSize_Widget(d, init_I2(iMin(rootSize.x, rootSize.y), -1));
+        }
+        else {
+            d->rect.size.x = 0;
         }
-        d->rect.size.x = rootSize.x;
     }
     updateMenuItemFonts_Widget_(d);
     arrange_Widget(d);
-    if (isPortraitPhone) {
+    if (!isSlidePanel) {
+        /* LAYOUT BUG: Height of wrapped menu items is incorrect with a single arrange! */
+    arrange_Widget(d);
+    }
+    if (deviceType_App() == phone_AppDeviceType) {
         if (isSlidePanel) {
             d->rect.pos = zero_I2();
         }
         else {
-            d->rect.pos = init_I2(0, rootSize.y);
+            d->rect.pos = windowToLocal_Widget(d,
+                                               init_I2(rootSize.x / 2 - d->rect.size.x / 2,
+                                                       rootSize.y));
         }
     }
     else if (menuOpenFlags & center_MenuOpenFlags) {
@@ -1143,6 +1213,9 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
         leftExcess   += l;
         rightExcess  += r;
     }
+#elif defined (iPlatformMobile)
+    /* Reserve space for the keyboard. */
+    bottomExcess += get_MainWindow()->keyboardHeight;
 #endif
     if (!allowOverflow) {
         if (bottomExcess > 0 && (!isPortraitPhone || !isSlidePanel)) {
@@ -1203,6 +1276,15 @@ iLabelWidget *findMenuItem_Widget(iWidget *menu, const char *command) {
     return NULL;
 }
 
+iWidget *findUserData_Widget(iWidget *d, void *userData) {
+    iForEach(ObjectList, i, children_Widget(d)) {
+        if (userData_Object(i.object) == userData) {
+            return i.object;
+        }
+    }
+    return NULL;
+}
+
 void setMenuItemDisabled_Widget(iWidget *menu, const char *command, iBool disable) {
     if (flags_Widget(menu) & nativeMenu_WidgetFlag) {
         setDisabled_NativeMenuItem(findNativeMenuItem_Widget(menu, command), disable);
@@ -1269,6 +1351,12 @@ const iString *removeMenuItemLabelPrefixes_String(const iString *d) {
     return collect_String(str);
 }
 
+static const iString *replaceNewlinesWithDash_(const iString *str) {
+    iString *mod = copy_String(str);
+    replace_String(mod, "\n", "  ");
+    return collect_String(mod);
+}
+
 void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *selectedCommand) {
     if (!dropButton) {
         return;
@@ -1279,8 +1367,9 @@ void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *s
         iMenuItem *item = findNativeMenuItem_Widget(menu, selectedCommand);
         if (item) {
             setSelected_NativeMenuItem(item, iTrue);
-            updateText_LabelWidget(
-                dropButton, removeMenuItemLabelPrefixes_String(collectNewCStr_String(item->label)));
+            updateText_LabelWidget(dropButton,
+                                   replaceNewlinesWithDash_(removeMenuItemLabelPrefixes_String(
+                                       collectNewCStr_String(item->label))));
             checkIcon_LabelWidget(dropButton);
         }
         return;
@@ -1291,7 +1380,8 @@ void updateDropdownSelection_LabelWidget(iLabelWidget *dropButton, const char *s
             const iBool isSelected = endsWith_String(command_LabelWidget(item), selectedCommand);
             setFlags_Widget(as_Widget(item), selected_WidgetFlag, isSelected);
             if (isSelected) {
-                updateText_LabelWidget(dropButton, sourceText_LabelWidget(item));
+                updateText_LabelWidget(dropButton,
+                                       replaceNewlinesWithDash_(text_LabelWidget(item)));
                 checkIcon_LabelWidget(dropButton);
             }
         }
@@ -1342,7 +1432,7 @@ static iBool tabSwitcher_(iWidget *tabs, const char *cmd) {
     if (equal_Command(cmd, "tabs.switch")) {
         iWidget *target = pointerLabel_Command(cmd, "page");
         if (!target) {
-            target = findChild_Widget(tabs, cstr_Rangecc(range_Command(cmd, "id")));
+            target = findChild_Widget(tabs, cstr_Command(cmd, "id"));
         }
         if (!target) return iFalse;
         unfocusFocusInsideTabPage_(currentTabPage_Widget(tabs));
@@ -1377,7 +1467,7 @@ static iBool tabSwitcher_(iWidget *tabs, const char *cmd) {
             iWidget *nextTabs = findChild_Widget(otherRoot_Window(get_Window(), tabs->root)->widget,
                                                  "doctabs");
             iWidget *nextPages = findChild_Widget(nextTabs, "tabs.pages");
-            tabIndex = (dir < 0 ? childCount_Widget(nextPages) - 1 : 0);
+            tabIndex = (int) (dir < 0 ? childCount_Widget(nextPages) - 1 : 0);
             showTabPage_Widget(nextTabs, child_Widget(nextPages, tabIndex));
             postCommand_App("keyroot.next");
         }
@@ -1602,6 +1692,22 @@ void useSheetStyle_Widget(iWidget *d) {
                     iTrue);
 }
 
+static iLabelWidget *addDialogTitle_(iWidget *dlg, const char *text, const char *id) {
+    iLabelWidget *label = new_LabelWidget(text, NULL);
+    addChildFlags_Widget(dlg, iClob(label), alignLeft_WidgetFlag | frameless_WidgetFlag |
+                                                resizeToParentWidth_WidgetFlag);
+    setAllCaps_LabelWidget(label, iTrue);
+    setTextColor_LabelWidget(label, uiHeading_ColorId);
+    if (id) {
+        setId_Widget(as_Widget(label), id);
+    }
+    return label;
+}
+
+iLabelWidget *addDialogTitle_Widget(iWidget *dlg, const char *text, const char *idOrNull) {
+    return addDialogTitle_(dlg, text, idOrNull);
+}
+
 static void acceptValueInput_(iWidget *dlg) {
     const iInputWidget *input = findChild_Widget(dlg, "input");
     if (!isEmpty_String(id_Widget(dlg))) {
@@ -1613,7 +1719,7 @@ static void acceptValueInput_(iWidget *dlg) {
     }
 }
 
-static void updateValueInputWidth_(iWidget *dlg) {
+static void updateValueInputSizing_(iWidget *dlg) {
     const iRect safeRoot = safeRect_Root(dlg->root);
     const iInt2 rootSize = safeRoot.size;
     iWidget *   title    = findChild_Widget(dlg, "valueinput.title");
@@ -1623,18 +1729,19 @@ static void updateValueInputWidth_(iWidget *dlg) {
     }
     else {
         dlg->rect.size.x =
-            iMin(rootSize.x, iMaxi(iMaxi(100 * gap_UI, title->rect.size.x), prompt->rect.size.x));
+            iMin(rootSize.x, iMaxi(iMaxi(100 * gap_UI, title ? title->rect.size.x : 0),
+                                   prompt->rect.size.x));
     }
     /* Adjust the maximum number of visible lines. */
-    int footer = 6 * gap_UI + get_MainWindow()->keyboardHeight;
+    int footer = 6 * gap_UI;
     iWidget *buttons = findChild_Widget(dlg, "dialogbuttons");
-    if (buttons) {
+    if (buttons && deviceType_App() == desktop_AppDeviceType) {
         footer += height_Widget(buttons);
     }
     iInputWidget *input = findChild_Widget(dlg, "input");
     setLineLimits_InputWidget(input,
                               1,
-                              (bottom_Rect(safeRect_Root(dlg->root)) - footer -
+                              (bottom_Rect(visibleRect_Root(dlg->root)) - footer -
                                top_Rect(boundsWithoutVisualOffset_Widget(as_Widget(input)))) /
                                   lineHeight_Text(font_InputWidget(input)));
 }
@@ -1643,11 +1750,17 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
     iWidget *ptr = as_Widget(pointer_Command(cmd));
     if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "keyboard.changed")) {
         if (isVisible_Widget(dlg)) {
-            updateValueInputWidth_(dlg);
+            updateValueInputSizing_(dlg);
             arrange_Widget(dlg);
         }
         return iFalse;
     }
+    if (equal_Command(cmd, "input.resized")) {
+        /* BUG: A single arrange here is not sufficient, leaving a big gap between prompt and input. Why? */
+        arrange_Widget(dlg);
+        arrange_Widget(dlg);
+        return iTrue;
+    }
     if (equal_Command(cmd, "input.ended")) {
         if (argLabel_Command(cmd, "enter") && hasParent_Widget(ptr, dlg)) {
             if (arg_Command(cmd)) {
@@ -1663,6 +1776,12 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "valueinput.set")) {
+        iInputWidget *input = findChild_Widget(dlg, "input");
+        setTextCStr_InputWidget(input, suffixPtr_Command(cmd, "text"));
+        validate_InputWidget(input);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "valueinput.cancel")) {
         postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
         setId_Widget(dlg, ""); /* no further commands to emit */
@@ -1699,9 +1818,9 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
         addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
     }
     int fonts[2] = { uiLabel_FontId, uiLabelBold_FontId };
-    if (deviceType_App() == phone_AppDeviceType) {
-        fonts[0] = uiLabelMedium_FontId;
-        fonts[1] = uiLabelMediumBold_FontId;
+    if (deviceType_App() != desktop_AppDeviceType) {
+        fonts[0] = uiLabelBig_FontId;
+        fonts[1] = uiLabelBigBold_FontId;
     }
     for (size_t i = 0; i < numActions; i++) {
         const char *label     = actions[i].label;
@@ -1743,6 +1862,10 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
             setId_Widget(as_Widget(button), "default");
         }
         setFlags_Widget(as_Widget(button), alignLeft_WidgetFlag | drawKey_WidgetFlag, isDefault);
+        if (deviceType_App() != desktop_AppDeviceType) {
+            setFlags_Widget(as_Widget(button), frameless_WidgetFlag | noBackground_WidgetFlag, iTrue);
+            setTextColor_LabelWidget(button, uiTextAction_ColorId);
+        }
         setFont_LabelWidget(button, isDefault ? fonts[1] : fonts[0]);
     }
     return div;
@@ -1758,9 +1881,9 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     if (parent) {
         addChild_Widget(parent, iClob(dlg));
     }
-    setId_Widget(
-        addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag),
-        "valueinput.title");
+    if (deviceType_App() == desktop_AppDeviceType) { /* conserve space on mobile */
+        addDialogTitle_(dlg, title, "valueinput.title");
+    }
     iLabelWidget *promptLabel;
     setId_Widget(addChildFlags_Widget(
                      dlg, iClob(promptLabel = new_LabelWidget(prompt, NULL)), frameless_WidgetFlag
@@ -1780,27 +1903,38 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     }
     setId_Widget(as_Widget(input), "input");
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
-    addChild_Widget(dlg,
-                    iClob(makeDialogButtons_Widget(
-                        (iMenuItem[]){ { "${cancel}", SDLK_ESCAPE, 0, "valueinput.cancel" },
-                                       { acceptLabel,
+    /* On mobile, the actions are laid out a bit differently: buttons on top, on opposite edges. */
+    iArray actions;
+    init_Array(&actions, sizeof(iMenuItem));
+    pushBack_Array(&actions, &(iMenuItem){ "${cancel}", SDLK_ESCAPE, 0, "valueinput.cancel" });
+    if (deviceType_App() != desktop_AppDeviceType) {
+        pushBack_Array(&actions, &(iMenuItem){ "---" });
+    }
+    pushBack_Array(&actions, &(iMenuItem){
+        acceptLabel,
                                          SDLK_RETURN,
                                          acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey),
-                                         "valueinput.accept" } },
-                        2)));
-//    finalizeSheet_Mobile(dlg);
+        "valueinput.accept"
+    });
+    addChildPos_Widget(dlg,
+                       iClob(makeDialogButtons_Widget(constData_Array(&actions),
+                                                      size_Array(&actions))),
+                       deviceType_App() != desktop_AppDeviceType ?
+                        front_WidgetAddPos : back_WidgetAddPos);
+    deinit_Array(&actions);
     arrange_Widget(dlg);
     if (parent) {
         setFocus_Widget(as_Widget(input));
     }
-    /* Check that the top is in the safe area. */ {
-        int top = top_Rect(bounds_Widget(dlg));
+    /* Check that the top is in the safe area. */
+    if (deviceType_App() != desktop_AppDeviceType) {
+        int top = top_Rect(boundsWithoutVisualOffset_Widget(dlg));
         int delta = top - top_Rect(safeRect_Root(dlg->root));
         if (delta < 0) {
             dlg->rect.pos.y -= delta;
         }
     }
-    updateValueInputWidth_(dlg);
+    updateValueInputSizing_(dlg);
     setupSheetTransition_Mobile(dlg, incoming_TransitionFlag | top_TransitionDir);
     return dlg;
 }
@@ -1808,7 +1942,7 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
 void updateValueInput_Widget(iWidget *d, const char *title, const char *prompt) {
     setTextCStr_LabelWidget(findChild_Widget(d, "valueinput.title"), title);
     setTextCStr_LabelWidget(findChild_Widget(d, "valueinput.prompt"), prompt);
-    updateValueInputWidth_(d);
+    updateValueInputSizing_(d);
 }
 
 static void updateQuestionWidth_(iWidget *dlg) {
@@ -1894,9 +2028,7 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
     }
     iWidget *dlg = makeSheet_Widget("");
     setCommandHandler_Widget(dlg, messageHandler_);
-    setId_Widget(
-        addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag),
-        "question.title");
+    addDialogTitle_(dlg, title, "question.title");
     iLabelWidget *msgLabel;
     setId_Widget(addChildFlags_Widget(dlg,
                                       iClob(msgLabel = new_LabelWidget(msg, NULL)),
@@ -2021,9 +2153,11 @@ iWidget *appendTwoColumnTabPage_Widget(iWidget *tabs, const char *title, int sho
 }
 
 static void makeTwoColumnHeading_(const char *title, iWidget *headings, iWidget *values) {
-    addChildFlags_Widget(headings,
-                         iClob(makeHeading_Widget(format_CStr(uiHeading_ColorEscape "%s", title))),
-                         ignoreForParentWidth_WidgetFlag);
+    setFont_LabelWidget(addChildFlags_Widget(headings,
+                                             iClob(makeHeading_Widget(
+                                                 format_CStr(uiHeading_ColorEscape "%s", title))),
+                                             ignoreForParentWidth_WidgetFlag),
+                        uiLabelBold_FontId);
     addChild_Widget(values, iClob(makeHeading_Widget("")));
 }
 
@@ -2071,28 +2205,6 @@ static const iArray *makeFontItems_(const char *id) {
                           0,
                           format_CStr("!font.set %s:%s", id, cstr_String(&spec->id)) });
     }
-#if 0
-    const struct {
-        const char *   name;
-        enum iTextFont cfgId;
-    } fonts[] = { { "Nunito", nunito_TextFont },
-                  { "Source Sans 3", sourceSans3_TextFont },
-                  { "Fira Sans", firaSans_TextFont },
-                  { "---", -1 },
-                  { "Literata", literata_TextFont },
-                  { "Tinos", tinos_TextFont },
-                  { "---", -1 },
-                  { "Iosevka", iosevka_TextFont } };
-    iForIndices(i, fonts) {
-        pushBack_Array(items,
-                       &(iMenuItem){ fonts[i].name,
-                                     0,
-                                     0,
-                                     fonts[i].cfgId >= 0
-                                         ? format_CStr("!%s.set arg:%d", id, fonts[i].cfgId)
-                                         : NULL });
-    }
-#endif
     pushBack_Array(items, &(iMenuItem){ NULL }); /* terminator */
     return items;
 }
@@ -2108,13 +2220,6 @@ static void addFontButtons_(iWidget *parent, const char *id) {
     addChildFlags_Widget(parent, iClob(button), alignLeft_WidgetFlag);
 }
 
-#if 0
-static int cmp_MenuItem_(const void *e1, const void *e2) {
-    const iMenuItem *a = e1, *b = e2;
-    return iCmpStr(a->label, b->label);
-}
-#endif
-
 void updatePreferencesLayout_Widget(iWidget *prefs) {
     if (!prefs || deviceType_App() != desktop_AppDeviceType) {
         return;
@@ -2299,6 +2404,15 @@ iWidget *makePreferences_Widget(void) {
           format_CStr("returnkey.set arg:%d", acceptWithPrimaryMod_ReturnKeyBehavior) },
         { NULL }
     };
+    iMenuItem toolbarActionItems[2][max_ToolbarAction];
+    iZap(toolbarActionItems);
+    for (int j = 0; j < 2; j++) {
+        for (int i = 0; i < sidebar_ToolbarAction; i++) {
+            toolbarActionItems[j][i].label = toolbarActions_Mobile[i].label;
+            toolbarActionItems[j][i].command =
+                format_CStr("toolbar.action.set arg:%d button:%d", i, j);
+        }
+    }
     iMenuItem docThemes[2][max_GmDocumentTheme + 1];
     for (int i = 0; i < 2; ++i) {
         const iBool isDark = (i == 0);
@@ -2390,24 +2504,27 @@ iWidget *makePreferences_Widget(void) {
         };
         const iMenuItem uiPanelItems[] = {
             { "title id:heading.prefs.interface" },
-            { "dropdown device:1 id:prefs.returnkey", 0, 0, (const void *) returnKeyBehaviors },
+            { "dropdown device:0 id:prefs.returnkey", 0, 0, (const void *) returnKeyBehaviors },
             { "padding device:1" },
-            { "toggle id:prefs.hoverlink" },
             { "toggle device:2 id:prefs.hidetoolbarscroll" },
+            { "heading device:2 id:heading.prefs.toolbaractions" },
+            { "dropdown device:2 id:prefs.toolbaraction1", 0, 0, (const void *) toolbarActionItems[0] },
+            { "dropdown device:2 id:prefs.toolbaraction2", 0, 0, (const void *) toolbarActionItems[1] },
             { "heading id:heading.prefs.sizing" },
             { "input id:prefs.uiscale maxlen:8" },
             { NULL }
         };
         const iMenuItem colorPanelItems[] = {
             { "title id:heading.prefs.colors" },
-            { "heading id:heading.prefs.uitheme" },
+#if !defined (iPlatformAndroidMobile)
             { "toggle id:prefs.ostheme" },
+#endif
             { "radio id:prefs.theme", 0, 0, (const void *) themeItems },
             { "radio id:prefs.accent", 0, 0, (const void *) accentItems },
             { "heading id:heading.prefs.pagecontent" },
             { "dropdown id:prefs.doctheme.dark", 0, 0, (const void *) docThemes[0] },
             { "dropdown id:prefs.doctheme.light", 0, 0, (const void *) docThemes[1] },
-            { "radio id:prefs.saturation", 0, 0, (const void *) satItems },
+            { "radio horizontal:1 id:prefs.saturation", 0, 0, (const void *) satItems },
             { "padding" },
             { "dropdown id:prefs.imagestyle", 0, 0, (const void *) imgStyles },
             { NULL }  
@@ -2418,18 +2535,23 @@ iWidget *makePreferences_Widget(void) {
             { "dropdown id:prefs.font.body", 0, 0, (const void *) constData_Array(makeFontItems_("body")) },
             { "dropdown id:prefs.font.mono", 0, 0, (const void *) constData_Array(makeFontItems_("mono")) },
             { "buttons id:prefs.mono", 0, 0, (const void *) monoFontItems },
-            { "dropdown id:prefs.font.monodoc", 0, 0, (const void *) constData_Array(makeFontItems_("monodoc")) },
             { "padding" },
-            { "toggle id:prefs.font.smooth" },
+            { "dropdown id:prefs.font.monodoc", 0, 0, (const void *) constData_Array(makeFontItems_("monodoc")) },
             { "padding" },
-            { "dropdown id:prefs.font.ui", 0, 0, (const void *) constData_Array(makeFontItems_("ui")) },
+            { "toggle id:prefs.font.warnmissing" },
+            { "heading id:prefs.gemtext.ansi" },
+            { "toggle id:prefs.gemtext.ansi.fg" },
+            { "toggle id:prefs.gemtext.ansi.bg" },
+            { "toggle id:prefs.gemtext.ansi.fontstyle" },
+//            { "padding" },
+//            { "dropdown id:prefs.font.ui", 0, 0, (const void *) constData_Array(makeFontItems_("ui")) },
             { "padding" },
-            { "button text:" fontpack_Icon " ${menu.fonts}", 0, 0, "!open url:about:fonts" },
+            { "button text:" fontpack_Icon " " uiTextAction_ColorEscape "${menu.fonts}", 0, 0, "!open url:about:fonts" },
             { NULL }  
         };
         const iMenuItem stylePanelItems[] = {
             { "title id:heading.prefs.style" },
-            { "radio id:prefs.linewidth", 0, 0, (const void *) lineWidthItems },
+            { "radio horizontal:1 id:prefs.linewidth", 0, 0, (const void *) lineWidthItems },
             { "padding" },
             { "input id:prefs.linespacing maxlen:5" },
             { "radio id:prefs.quoteicon", 0, 0, (const void *) quoteItems },
@@ -2458,6 +2580,7 @@ iWidget *makePreferences_Widget(void) {
         };
         const iMenuItem identityPanelItems[] = {
             { "title id:sidebar.identities" },
+            { "certlist" },
             { NULL }  
         };
         iString *aboutText = collectNew_String(); {
@@ -2466,6 +2589,10 @@ iWidget *makePreferences_Widget(void) {
             appendFormat_String(aboutText, " (" LAGRANGE_IOS_VERSION ") %s" LAGRANGE_IOS_BUILD_DATE,
                                 escape_Color(uiTextDim_ColorId));
 #endif
+#if defined (iPlatformAndroidMobile)
+            appendFormat_String(aboutText, " (" LAGRANGE_ANDROID_VERSION ") %s" LAGRANGE_ANDROID_BUILD_DATE,
+                                escape_Color(uiTextDim_ColorId));
+#endif
         }
         const iMenuItem aboutPanelItems[] = {
             { format_CStr("heading text:%s", cstr_String(aboutText)) },
@@ -2482,7 +2609,7 @@ iWidget *makePreferences_Widget(void) {
             { "title id:heading.settings" },
             { "panel text:" gear_Icon " ${heading.prefs.general}", 0, 0, (const void *) generalPanelItems },
             { "panel icon:0x1f5a7 id:heading.prefs.network", 0, 0, (const void *) networkPanelItems },
-            { "panel text:" person_Icon " ${sidebar.identities}", 0, 0, (const void *) identityPanelItems },
+            { "panel noscroll:1 text:" person_Icon " ${sidebar.identities}", 0, 0, (const void *) identityPanelItems },
             { "padding" },
             { "panel icon:0x1f4f1 id:heading.prefs.interface", 0, 0, (const void *) uiPanelItems },
             { "panel icon:0x1f3a8 id:heading.prefs.colors", 0, 0, (const void *) colorPanelItems },
@@ -2498,9 +2625,7 @@ iWidget *makePreferences_Widget(void) {
         return dlg;
     }
     iWidget *dlg = makeSheet_Widget("prefs");
-    addChildFlags_Widget(dlg,
-                         iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.prefs}", NULL)),
-                         frameless_WidgetFlag);
+    addDialogTitle_(dlg, "${heading.prefs}", NULL);
     iWidget *tabs = makeTabs_Widget(dlg);
     setBackgroundColor_Widget(findChild_Widget(tabs, "tabs.buttons"), uiBackgroundSidebar_ColorId);
     setId_Widget(tabs, "prefs.tabs");
@@ -2546,9 +2671,8 @@ iWidget *makePreferences_Widget(void) {
     }
     /* User Interface. */ {
         appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.interface}", '2', &headings, &values);
-#if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
-        addDialogToggle_(headings, values, "${prefs.customframe}", "prefs.customframe");
-#endif
+        addDialogToggle_(headings, values, "${prefs.animate}", "prefs.animate");
+        addDialogToggle_(headings, values, "${prefs.blink}", "prefs.blink");
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.returnkey}")));
         /* Return key behaviors. */ {
             iLabelWidget *returnKey = makeMenuButton_LabelWidget(
@@ -2562,7 +2686,9 @@ iWidget *makePreferences_Widget(void) {
             setId_Widget(addChildFlags_Widget(values, iClob(returnKey), alignLeft_WidgetFlag),
                          "prefs.returnkey");
         }
-        addDialogToggle_(headings, values, "${prefs.animate}", "prefs.animate");
+#if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
+        addDialogToggle_(headings, values, "${prefs.customframe}", "prefs.customframe");
+#endif
         makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);
         addDialogToggle_(headings, values, "${prefs.smoothscroll}", "prefs.smoothscroll");
         /* Scroll speeds. */ {
@@ -2827,7 +2953,7 @@ static iBool isBookmarkFolder_(void *context, const iBookmark *bm) {
     return isFolder_Bookmark(bm);
 }
 
-static const iArray *makeBookmarkFolderItems_(void) {
+static const iArray *makeBookmarkFolderItems_(iBool withNullTerminator) {
     iArray *folders = new_Array(sizeof(iMenuItem));
     pushBack_Array(folders, &(iMenuItem){ "\u2014", 0, 0, "dlg.bookmark.setfolder arg:0" });
     iConstForEach(
@@ -2848,6 +2974,9 @@ static const iArray *makeBookmarkFolderItems_(void) {
                           0,
                           format_CStr("dlg.bookmark.setfolder arg:%u", id_Bookmark(bm)) });
     }
+    if (withNullTerminator) {
+        pushBack_Array(folders, &(iMenuItem){ NULL });
+    }
     return collect_Array(folders); 
 }
 
@@ -2856,40 +2985,37 @@ iWidget *makeBookmarkEditor_Widget(void) {
         { "${cancel}", 0, 0, "bmed.cancel" },
         { uiTextCaution_ColorEscape "${dlg.bookmark.save}", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept" }
     };
+    iWidget *dlg = NULL;
     if (isUsingPanelLayout_Mobile()) {
+        const iArray *folderItems = makeBookmarkFolderItems_(iTrue);
         const iMenuItem items[] = {
             { "title id:bmed.heading text:${heading.bookmark.edit}" },
             { "heading id:dlg.bookmark.url" },
             { "input id:bmed.url url:1 noheading:1" },
             { "padding" },
             { "input id:bmed.title text:${dlg.bookmark.title}" },
-            { "input id:bmed.tags text:${dlg.bookmark.tags}" },
+            { "dropdown id:bmed.folder text:${dlg.bookmark.folder}", 0, 0, (const void *) constData_Array(folderItems) },
+            { "padding" },
             { "input id:bmed.icon maxlen:1 text:${dlg.bookmark.icon}" },
+            { "input id:bmed.tags text:${dlg.bookmark.tags}" },
             { "heading text:${heading.bookmark.tags}" },
             { "toggle id:bmed.tag.home text:${bookmark.tag.home}" },
             { "toggle id:bmed.tag.remote text:${bookmark.tag.remote}" },
             { "toggle id:bmed.tag.linksplit text:${bookmark.tag.linksplit}" },
             { NULL }
         };
-        iWidget *dlg = makePanels_Mobile("bmed", items, actions, iElemCount(actions));
+        dlg = makePanels_Mobile("bmed", items, actions, iElemCount(actions));
         setupSheetTransition_Mobile(dlg, iTrue);
-        return dlg;
     }
-    iWidget *dlg = makeSheet_Widget("bmed");
-    setId_Widget(addChildFlags_Widget(
-                     dlg,
-                     iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.bookmark.edit}", NULL)),
-                     frameless_WidgetFlag),
-                 "bmed.heading");
+    else {
+        dlg = makeSheet_Widget("bmed");
+    addDialogTitle_(dlg, "${heading.bookmark.edit}", "bmed.heading");
     iWidget *headings, *values;
     addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
     iInputWidget *inputs[4];
-    addDialogInputWithHeading_(headings, values, "${dlg.bookmark.title}", "bmed.title", iClob(inputs[0] = new_InputWidget(0)));
-    addDialogInputWithHeading_(headings, values, "${dlg.bookmark.url}",   "bmed.url",   iClob(inputs[1] = new_InputWidget(0)));
-    setUrlContent_InputWidget(inputs[1], iTrue);
     /* Folder to add to. */ {
         addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.bookmark.folder}")));
-        const iArray *folderItems = makeBookmarkFolderItems_();
+            const iArray *folderItems = makeBookmarkFolderItems_(iFalse);
         iLabelWidget *folderButton;
         setId_Widget(addChildFlags_Widget(values,
                                      iClob(folderButton = makeMenuButton_LabelWidget(
@@ -2897,11 +3023,10 @@ iWidget *makeBookmarkEditor_Widget(void) {
                                                constData_Array(folderItems),
                                                size_Array(folderItems))), alignLeft_WidgetFlag),
                      "bmed.folder");
-        const uint32_t recentFolderId = recentFolder_Bookmarks(bookmarks_App());
-        updateDropdownSelection_LabelWidget(
-            folderButton, format_CStr(" arg:%u", recentFolderId));
-        setUserData_Object(folderButton, get_Bookmarks(bookmarks_App(), recentFolderId));
     }
+        addDialogInputWithHeading_(headings, values, "${dlg.bookmark.title}", "bmed.title", iClob(inputs[0] = new_InputWidget(0)));
+        addDialogInputWithHeading_(headings, values, "${dlg.bookmark.url}",   "bmed.url",   iClob(inputs[1] = new_InputWidget(0)));
+        setUrlContent_InputWidget(inputs[1], iTrue);
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.tags}",  "bmed.tags",  iClob(inputs[2] = new_InputWidget(0)));
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.icon}",  "bmed.icon",  iClob(inputs[3] = new_InputWidget(1)));
     /* Buttons for special tags. */
@@ -2921,6 +3046,12 @@ iWidget *makeBookmarkEditor_Widget(void) {
     addChild_Widget(dlg, iClob(makeDialogButtons_Widget(actions, iElemCount(actions))));
     addChild_Widget(get_Root()->widget, iClob(dlg));
     setupSheetTransition_Mobile(dlg, iTrue);
+    }
+    /* Use a recently accessed folder as the default. */
+    const uint32_t recentFolderId = recentFolder_Bookmarks(bookmarks_App());
+    iLabelWidget *folderDrop = findChild_Widget(dlg, "bmed.folder");
+    updateDropdownSelection_LabelWidget(folderDrop, format_CStr(" arg:%u", recentFolderId));
+    setUserData_Object(folderDrop, get_Bookmarks(bookmarks_App(), recentFolderId));
     return dlg;
 }
 
@@ -2945,16 +3076,16 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             const uint32_t id    = add_Bookmarks(bookmarks_App(), url, title, tags, first_String(icon));
             iBookmark *    bm    = get_Bookmarks(bookmarks_App(), id);
             if (!isEmpty_String(icon)) {
-                addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
+                bm->flags |= userIcon_BookmarkFlag;
             }
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.home"))) {
-                addTag_Bookmark(bm, homepage_BookmarkTag);
+                bm->flags |= homepage_BookmarkFlag;
             }
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote"))) {
-                addTag_Bookmark(bm, remoteSource_BookmarkTag);
+                bm->flags |= remoteSource_BookmarkFlag;
             }
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit"))) {
-                addTag_Bookmark(bm, linkSplit_BookmarkTag);
+                bm->flags |= linkSplit_BookmarkFlag;
             }
             bm->parentId = folder ? id_Bookmark(folder) : 0;
             setRecentFolder_Bookmarks(bookmarks_App(), bm->parentId);
@@ -3020,9 +3151,9 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
         iBookmark *bm = get_Bookmarks(bookmarks_App(), id);
         iAssert(bm);
         set_String(&bm->title, feedTitle);
-        addOrRemoveTag_Bookmark(bm, subscribed_BookmarkTag, iTrue);
-        addOrRemoveTag_Bookmark(bm, headings_BookmarkTag, headings);
-        addOrRemoveTag_Bookmark(bm, ignoreWeb_BookmarkTag, ignoreWeb);
+        bm->flags |= subscribed_BookmarkFlag;
+        iChangeFlags(bm->flags, headings_BookmarkFlag, headings);
+        iChangeFlags(bm->flags, ignoreWeb_BookmarkFlag, ignoreWeb);
         postCommand_App("bookmarks.changed");
         setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
@@ -3051,15 +3182,14 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
             { format_CStr("title id:feedcfg.heading text:%s", headingText) },
             { "input id:feedcfg.title text:${dlg.feed.title}" },
             { "radio id:dlg.feed.entrytype", 0, 0, (const void *) typeItems },
+            { "padding" },
             { "toggle id:feedcfg.ignoreweb text:${dlg.feed.ignoreweb}" },
             { NULL }
         }, actions, iElemCount(actions));
     }
     else {
         dlg = makeSheet_Widget("feedcfg");
-        setId_Widget(
-            addChildFlags_Widget(dlg, iClob(new_LabelWidget(headingText, NULL)), frameless_WidgetFlag),
-            "feedcfg.heading");
+        addDialogTitle_(dlg, headingText, "feedcfg.heading");
         iWidget *headings, *values;
         addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
         iInputWidget *input = new_InputWidget(0);
@@ -3085,13 +3215,13 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
         setText_InputWidget(findChild_Widget(dlg, "feedcfg.title"),
                             bm ? &bm->title : feedTitle_DocumentWidget(document_App()));
         setFlags_Widget(findChild_Widget(dlg,
-                                         hasTag_Bookmark(bm, headings_BookmarkTag)
+                                         bm && bm->flags & headings_BookmarkFlag
                                              ? "feedcfg.type.headings"
                                              : "feedcfg.type.gemini"),
                         selected_WidgetFlag,
                         iTrue);
         setToggle_Widget(findChild_Widget(dlg, "feedcfg.ignoreweb"),
-                         hasTag_Bookmark(bm, ignoreWeb_BookmarkTag));
+                         bm && bm->flags & ignoreWeb_BookmarkFlag);
         setCommandHandler_Widget(dlg, handleFeedSettingCommands_);
     }
     setupSheetTransition_Mobile(dlg, incoming_TransitionFlag);
@@ -3138,11 +3268,7 @@ iWidget *makeIdentityCreation_Widget(void) {
     }
     else {
         dlg = makeSheet_Widget("ident");
-        setId_Widget(addChildFlags_Widget(
-                         dlg,
-                         iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.newident}", NULL)),
-                         frameless_WidgetFlag),
-                     "ident.heading");
+        addDialogTitle_(dlg, "${heading.newident}", "ident.heading");
         iWidget *page = new_Widget();
         addChildFlags_Widget(
             dlg, iClob(new_LabelWidget("${dlg.newident.rsa.selfsign}", NULL)), frameless_WidgetFlag);
@@ -3226,7 +3352,7 @@ static const iMenuItem languages[] = {
 static iBool translationHandler_(iWidget *dlg, const char *cmd) {
     iUnused(dlg);
     if (equal_Command(cmd, "xlt.lang")) {
-        const iMenuItem *langItem = &languages[languageIndex_CStr(cstr_Rangecc(range_Command(cmd, "id")))];
+        const iMenuItem *langItem = &languages[languageIndex_CStr(cstr_Command(cmd, "id"))];
         iWidget *widget = pointer_Command(cmd);
         iLabelWidget *drop;
         if (flags_Widget(widget) & nativeMenu_WidgetFlag) {
@@ -3246,7 +3372,7 @@ const char *languageId_String(const iString *menuItemLabel) {
     iForIndices(i, languages) {
         if (!languages[i].label) break;
         if (!cmp_String(menuItemLabel, translateCStr_Lang(languages[i].label))) {
-            return cstr_Rangecc(range_Command(languages[i].command, "id"));
+            return cstr_Command(languages[i].command, "id");
         }
     }
     return "";
@@ -3280,10 +3406,7 @@ iWidget *makeTranslation_Widget(iWidget *parent) {
         dlg = makeSheet_Widget("xlt");
         setFlags_Widget(dlg, keepOnTop_WidgetFlag, iFalse);
         dlg->minSize.x = 70 * gap_UI;
-        addChildFlags_Widget(
-            dlg,
-            iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.translate}", NULL)),
-            frameless_WidgetFlag);
+        addDialogTitle_(dlg, "${heading.translate}", NULL);
         addChild_Widget(dlg, iClob(makePadding_Widget(lineHeight_Text(uiLabel_FontId))));
         iWidget *headings, *values;
         iWidget *page;
@@ -3316,20 +3439,13 @@ iWidget *makeTranslation_Widget(iWidget *parent) {
         addChild_Widget(dlg, iClob(makeDialogButtons_Widget(actions, iElemCount(actions))));
         addChild_Widget(parent, iClob(dlg));
         arrange_Widget(dlg);
+        arrange_Widget(dlg); /* TODO: Augh, another layout bug: two arranges required. */
     }
     /* Update choices. */
     updateDropdownSelection_LabelWidget(findChild_Widget(dlg, "xlt.from"),
                                         languages[prefs_App()->langFrom].command);
     updateDropdownSelection_LabelWidget(findChild_Widget(dlg, "xlt.to"),
                                         languages[prefs_App()->langTo].command);
-//    updateText_LabelWidget(
-//        findChild_Widget(dlg, "xlt.from"),
-//        text_LabelWidget(child_Widget(findChild_Widget(findChild_Widget(dlg, "xlt.from"), "menu"),
-//                                      prefs_App()->langFrom)));
-//    updateText_LabelWidget(
-//        findChild_Widget(dlg, "xlt.to"),
-//        text_LabelWidget(child_Widget(findChild_Widget(findChild_Widget(dlg, "xlt.to"), "menu"),
-//                                      prefs_App()->langTo)));
     setCommandHandler_Widget(dlg, translationHandler_);
     setupSheetTransition_Mobile(dlg, iTrue);
     return dlg;
diff --git a/src/ui/util.h b/src/ui/util.h
index d13d751b..98ce784c 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -47,16 +47,31 @@ iLocalDef iBool isMetricsChange_UserEvent(const SDL_Event *d) {
 }
 
 enum iMouseWheelFlag {
-    perPixel_MouseWheelFlag = iBit(9), /* e.g., trackpad or finger scroll; applied to `direction` */
+    /* Note: A future version of SDL may support per-pixel scrolling, but 2.0.x doesn't. */
+    perPixel_MouseWheelFlag       = iBit(9), /* e.g., trackpad or finger scroll; applied to `direction` */
+    inertia_MouseWheelFlag        = iBit(10),
+    scrollFinished_MouseWheelFlag = iBit(11),
 };
 
-/* Note: A future version of SDL may support per-pixel scrolling, but 2.0.x doesn't. */
 iLocalDef void setPerPixel_MouseWheelEvent(SDL_MouseWheelEvent *ev, iBool set) {
     iChangeFlags(ev->direction, perPixel_MouseWheelFlag, set);
 }
+iLocalDef void setInertia_MouseWheelEvent(SDL_MouseWheelEvent *ev, iBool set) {
+    iChangeFlags(ev->direction, inertia_MouseWheelFlag, set);
+}
+iLocalDef void setScrollFinished_MouseWheelEvent(SDL_MouseWheelEvent *ev, iBool set) {
+    iChangeFlags(ev->direction, scrollFinished_MouseWheelFlag, set);
+}
+
 iLocalDef iBool isPerPixel_MouseWheelEvent(const SDL_MouseWheelEvent *ev) {
     return (ev->direction & perPixel_MouseWheelFlag) != 0;
 }
+iLocalDef iBool isInertia_MouseWheelEvent(const SDL_MouseWheelEvent *ev) {
+    return (ev->direction & inertia_MouseWheelFlag) != 0;
+}
+iLocalDef iBool isScrollFinished_MouseWheelEvent(const SDL_MouseWheelEvent *ev) {
+    return (ev->direction & scrollFinished_MouseWheelFlag) != 0;
+}
 
 iInt2   coord_MouseWheelEvent   (const SDL_MouseWheelEvent *);
 
@@ -179,11 +194,18 @@ iDeclareType(SmoothScroll)
 
 typedef void (*iSmoothScrollNotifyFunc)(iAnyObject *, int offset, uint32_t span);
 
+enum iSmoothScrollFlags {
+    pullDownAction_SmoothScrollFlag = iBit(1),
+    pullUpAction_SmoothScrollFlag = iBit(2),
+};
+
 struct Impl_SmoothScroll {
     iAnim    pos;
     int      max;
     int      overscroll;
     iWidget *widget;
+    int      flags;
+    int      pullActionTriggered;
     iSmoothScrollNotifyFunc notify;
 };
 
@@ -197,6 +219,7 @@ iBool   processEvent_SmoothScroll   (iSmoothScroll *, const SDL_Event *ev);
 
 float   pos_SmoothScroll            (const iSmoothScroll *);
 iBool   isFinished_SmoothScroll     (const iSmoothScroll *);
+float   pullActionPos_SmoothScroll  (const iSmoothScroll *); /* 0...1 */
 
 /*-----------------------------------------------------------------------------------------------*/
 
@@ -249,7 +272,8 @@ void            setMenuItemDisabled_Widget      (iWidget *menu, const char *comm
 void            setMenuItemDisabledByIndex_Widget(iWidget *menu, size_t index, iBool disable);
 void            setMenuItemLabel_Widget         (iWidget *menu, const char *command, const char *newLabel);
 void            setMenuItemLabelByIndex_Widget  (iWidget *menu, size_t index, const char *newLabel);
-void            setNativeMenuItems_Widget       (iWidget *, const iMenuItem *items, size_t n);
+void            setNativeMenuItems_Widget       (iWidget *menu, const iMenuItem *items, size_t n);
+iWidget *       findUserData_Widget             (iWidget *, void *userData);
 
 int             checkContextMenu_Widget         (iWidget *, const SDL_Event *ev); /* see macro below */
 
@@ -293,6 +317,7 @@ iWidget *   makeTwoColumns_Widget       (iWidget **headings, iWidget **values);
 
 iLabelWidget *dialogAcceptButton_Widget (const iWidget *);
 
+iLabelWidget *addDialogTitle_Widget     (iWidget *, const char *text, const char *idOrNull);
 iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *values,
                                                   const char *labelText, const char *inputId,
                                                   iInputWidget *input);
diff --git a/src/ui/visbuf.c b/src/ui/visbuf.c
index 8f7a4c46..0097b12a 100644
--- a/src/ui/visbuf.c
+++ b/src/ui/visbuf.c
@@ -21,6 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "visbuf.h"
+#include "paint.h"
 #include "window.h"
 #include "util.h"
 
@@ -224,6 +225,8 @@ void draw_VisBuf(const iVisBuf *d, const iInt2 topLeft, const iRangei yClipBound
             continue; /* Outside the clipping area. */
 #endif
         }
+        dst.x += origin_Paint.x;
+        dst.y += origin_Paint.y;
 #if defined (DEBUG_SCALE)
         dst.w *= DEBUG_SCALE;
         dst.h *= DEBUG_SCALE;
diff --git a/src/ui/widget.c b/src/ui/widget.c
index cedda461..9f67b1c7 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -31,6 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "util.h"
 #include "window.h"
 
+#include "labelwidget.h"
+
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/ptrset.h>
 #include <SDL_mouse.h>
@@ -122,7 +124,9 @@ void init_Widget(iWidget *d) {
     init_String(&d->id);
     d->root           = get_Root(); /* never changes after this */
     d->flags          = 0;
+    d->flags2         = 0;
     d->rect           = zero_Rect();
+    d->oldSize        = zero_I2();
     d->minSize        = zero_I2();
     d->sizeRef        = NULL;
     d->offsetRef      = NULL;
@@ -139,8 +143,11 @@ void init_Widget(iWidget *d) {
 static void visualOffsetAnimation_Widget_(void *ptr) {
     iWidget *d = ptr;
     postRefresh_App();
+    d->root->didAnimateVisualOffsets = iTrue;
+//    printf("'%s' visoffanim: fin:%d val:%f\n", cstr_String(&d->id),
+//           isFinished_Anim(&d->visualOffset), value_Anim(&d->visualOffset)); fflush(stdout);
     if (!isFinished_Anim(&d->visualOffset)) {
-        addTicker_App(visualOffsetAnimation_Widget_, ptr);
+        addTickerRoot_App(visualOffsetAnimation_Widget_, d->root, ptr);
     }
     else {
         d->flags &= ~visualOffset_WidgetFlag;
@@ -269,10 +276,12 @@ void setMinSize_Widget(iWidget *d, iInt2 minSize) {
 }
 
 void setPadding_Widget(iWidget *d, int left, int top, int right, int bottom) {
-    d->padding[0] = left;
-    d->padding[1] = top;
-    d->padding[2] = right;
-    d->padding[3] = bottom;
+    if (d) {
+        d->padding[0] = left;
+        d->padding[1] = top;
+        d->padding[2] = right;
+        d->padding[3] = bottom;
+    }
 }
 
 iWidget *root_Widget(const iWidget *d) {
@@ -414,9 +423,10 @@ static iBool setWidth_Widget_(iWidget *d, int width) {
         if (d->rect.size.x != width) {
             d->rect.size.x = width;
             TRACE(d, "width has changed to %d", width);
-            if (class_Widget(d)->sizeChanged) {
-                class_Widget(d)->sizeChanged(d);
-            }
+//            if (~d->flags2 & undefinedWidth_WidgetFlag2 && class_Widget(d)->sizeChanged) {
+//                class_Widget(d)->sizeChanged(d);
+//            }
+//            d->flags2 &= ~undefinedWidth_WidgetFlag2;
             return iTrue;
         }
     }
@@ -437,9 +447,10 @@ static iBool setHeight_Widget_(iWidget *d, int height) {
         if (d->rect.size.y != height) {
             d->rect.size.y = height;
             TRACE(d, "height has changed to %d", height);
-            if (class_Widget(d)->sizeChanged) {
-                class_Widget(d)->sizeChanged(d);
-            }
+//            if (~d->flags2 & undefinedHeight_WidgetFlag2 && class_Widget(d)->sizeChanged) {
+//                class_Widget(d)->sizeChanged(d);
+//            }
+//            d->flags2 &= ~undefinedHeight_WidgetFlag2;
             return iTrue;
         }
     }
@@ -836,6 +847,13 @@ static void arrange_Widget_(iWidget *d) {
 }
 
 static void resetArrangement_Widget_(iWidget *d) {
+    d->oldSize = d->rect.size;
+    if (d->flags & resizeToParentWidth_WidgetFlag) {
+        d->rect.size.x = 0;
+    }
+    if (d->flags & resizeToParentHeight_WidgetFlag) {
+        d->rect.size.y = 0;
+    }
     iForEach(ObjectList, i, children_Widget(d)) {
         iWidget *child = as_Widget(i.object);
         resetArrangement_Widget_(child);
@@ -847,6 +865,14 @@ static void resetArrangement_Widget_(iWidget *d) {
                 ~child->flags & fixedWidth_WidgetFlag) {
                 child->rect.size.x = 0;
             }
+            if (d->flags & resizeChildrenToWidestChild_WidgetFlag) {
+                if (isInstance_Object(child, &Class_LabelWidget)) {
+                    updateSize_LabelWidget((iLabelWidget *) child);
+                }
+                else {
+                    child->rect.size.x = 0;
+                }
+            }
             if (d->flags & arrangeVertical_WidgetFlag) {
                 child->rect.pos.y = 0;
             }
@@ -858,6 +884,15 @@ static void resetArrangement_Widget_(iWidget *d) {
     }
 }
 
+static void notifySizeChanged_Widget_(iWidget *d) {
+    if (class_Widget(d)->sizeChanged && !isEqual_I2(d->rect.size, d->oldSize)) {
+        class_Widget(d)->sizeChanged(d);
+    }
+    iForEach(ObjectList, child, d->children) {
+        notifySizeChanged_Widget_(child.object);
+    }
+}
+
 void arrange_Widget(iWidget *d) {
     if (d) {
 #if !defined (NDEBUG)
@@ -867,6 +902,8 @@ void arrange_Widget(iWidget *d) {
 #endif
         resetArrangement_Widget_(d); /* back to initial default sizes */
         arrange_Widget_(d);
+        notifySizeChanged_Widget_(d);
+        d->root->didChangeArrangement = iTrue;
     }
 }
 
@@ -884,6 +921,14 @@ int visualOffsetByReference_Widget(const iWidget *d) {
 //                const float factor = width_Widget(d) / (float) size_Root(d->root).x;
                 const int invOff = width_Widget(d) - iRound(value_Anim(&child->visualOffset));
                 offX -= invOff / 4;
+#if 0
+                if (invOff) {
+                    printf("  [%p] %s (%p, fin:%d visoff:%d drag:%d): invOff %d\n", d, cstr_String(&child->id), child,
+                           isFinished_Anim(&child->visualOffset),
+                           (child->flags & visualOffset_WidgetFlag) != 0,
+                           (child->flags & dragged_WidgetFlag) != 0, invOff); fflush(stdout);
+                }
+#endif
             }
         }
         return offX;
@@ -1183,6 +1228,9 @@ iBool scrollOverflow_Widget(iWidget *d, int delta) {
             bounds.pos.y = iMin(bounds.pos.y, validPosRange.end);
         }
 //    printf("range: %d ... %d\n", range.start, range.end);
+        if (delta) {
+            d->root->didChangeArrangement = iTrue; /* ensure that widgets update if needed */
+        }
     }
     else {
         bounds.pos.y = iClamp(bounds.pos.y, validPosRange.start, validPosRange.end);
@@ -1370,7 +1418,8 @@ void drawLayerEffects_Widget(const iWidget *d) {
             shadowBorder = iFalse;
         }
     }
-    const iBool isFaded = fadeBackground && ~d->flags & noFadeBackground_WidgetFlag;
+    const iBool isFaded = (fadeBackground && ~d->flags & noFadeBackground_WidgetFlag) ||
+                          (d->flags2 & fadeBackground_WidgetFlag2);
     if (shadowBorder && ~d->flags & noShadowBorder_WidgetFlag) {
         iPaint p;
         init_Paint(&p);
@@ -1381,9 +1430,19 @@ void drawLayerEffects_Widget(const iWidget *d) {
         init_Paint(&p);
         p.alpha = 0x50;
         if (flags_Widget(d) & (visualOffset_WidgetFlag | dragged_WidgetFlag)) {
-            const float area = d->rect.size.x * d->rect.size.y;
+            const float area        = d->rect.size.x * d->rect.size.y;
+            const float rootArea    = area_Rect(rect_Root(d->root));
             const float visibleArea = area_Rect(intersect_Rect(bounds_Widget(d), rect_Root(d->root)));
-            p.alpha *= (area > 0 ? visibleArea / area : 0.0f);
+            if (isPortraitPhone_App() && !cmp_String(&d->id, "sidebar")) {
+                p.alpha *= iClamp(visibleArea / rootArea * 2, 0.0f, 1.0f);
+            }
+            else if (area > 0) {
+                p.alpha *= visibleArea / area;
+            }
+            else {
+                p.alpha = 0;
+            }
+            //printf("area:%f visarea:%f alpha:%d\n", rootArea, visibleArea, p.alpha);
         }
         SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
         fillRect_Paint(&p, rect_Root(d->root), backgroundFadeColor_Widget());
@@ -1851,7 +1910,7 @@ iAny *findParentClass_Widget(const iWidget *d, const iAnyClass *class) {
 }
 
 iAny *findOverflowScrollable_Widget(iWidget *d) {
-    const iRect rootRect = rect_Root(d->root);
+    const iRect rootRect = visibleRect_Root(d->root);
     for (iWidget *w = d; w; w = parent_Widget(w)) {
         if (flags_Widget(w) & overflowScrollable_WidgetFlag) {
             const iRect bounds = boundsWithoutVisualOffset_Widget(w);
@@ -1956,12 +2015,16 @@ iBool isAffectedByVisualOffset_Widget(const iWidget *d) {
         if (w->flags & visualOffset_WidgetFlag) {
             return iTrue;
         }
+        if (visualOffsetByReference_Widget(w) != 0) {
+            return iTrue;
+        }
     }
     return iFalse;
 }
 
 void setFocus_Widget(iWidget *d) {
-    iWindow *win = get_Window();
+    iWindow *win = d ? window_Widget(d) : get_Window();
+    iAssert(win);
     if (win->focus != d) {
         if (win->focus) {
             iAssert(!contains_PtrSet(win->focus->root->pendingDestruction, win->focus));
@@ -1976,6 +2039,13 @@ void setFocus_Widget(iWidget *d) {
     }
 }
 
+void setKeyboardGrab_Widget(iWidget *d) {
+    iWindow *win = d ? window_Widget(d) : get_Window();
+    iAssert(win);
+    win->focus = d;
+    /* no notifications sent */
+}
+
 iWidget *focus_Widget(void) {
     return get_Window()->focus;
 }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 4025f5c5..fb7eb5e2 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -123,6 +123,11 @@ enum iWidgetFlag {
 #define refChildrenOffset_WidgetFlag        iBit64(63) /* visual offset determined by the offset of referenced children */
 #define nativeMenu_WidgetFlag               iBit64(64)
 
+enum iWidgetFlag2 {
+    slidingSheetDraggable_WidgetFlag2 = iBit(1),
+    fadeBackground_WidgetFlag2        = iBit(2),
+};
+
 enum iWidgetAddPos {
     back_WidgetAddPos,
     front_WidgetAddPos,
@@ -139,7 +144,9 @@ struct Impl_Widget {
     iObject      object;
     iString      id;
     int64_t      flags;
+    int          flags2;
     iRect        rect;
+    iInt2        oldSize; /* in previous arrangement; for notification */
     iInt2        minSize;
     iWidget *    sizeRef;
     iWidget *    offsetRef;
@@ -230,6 +237,24 @@ iLocalDef int height_Widget(const iAnyObject *d) {
     }
     return 0;
 }
+iLocalDef int leftPad_Widget(const iWidget *d) {
+    return d->padding[0];
+}
+iLocalDef int topPad_Widget(const iWidget *d) {
+    return d->padding[1];
+}
+iLocalDef int rightPad_Widget(const iWidget *d) {
+    return d->padding[2];
+}
+iLocalDef int bottomPad_Widget(const iWidget *d) {
+    return d->padding[3];
+}
+iLocalDef iInt2 tlPad_Widget(const iWidget *d) {
+    return init_I2(leftPad_Widget(d), topPad_Widget(d));
+}
+iLocalDef iInt2 brPad_Widget(const iWidget *d) {
+    return init_I2(rightPad_Widget(d), bottomPad_Widget(d));
+}
 iLocalDef iObjectList *children_Widget(iAnyObject *d) {
     if (d == NULL) return NULL;
     iAssert(isInstance_Object(d, &Class_Widget));
@@ -302,7 +327,8 @@ void        scrollInfo_Widget           (const iWidget *, iWidgetScrollInfo *inf
 
 int         backgroundFadeColor_Widget  (void);
 
-void        setFocus_Widget         (iWidget *);
+void        setFocus_Widget         (iWidget *); /* widget must be flagged `focusable` */
+void        setKeyboardGrab_Widget  (iWidget *); /* sets focus on any widget */
 iWidget *   focus_Widget            (void);
 void        setHover_Widget         (iWidget *);
 iWidget *   hover_Widget            (void);
diff --git a/src/ui/window.c b/src/ui/window.c
index 9f12cabf..af36bb22 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -442,7 +442,7 @@ void create_Window_(iWindow *d, iRect rect, uint32_t flags) {
 static SDL_Surface *loadImage_(const iBlock *data, int resized) {
     int      w = 0, h = 0, num = 4;
     stbi_uc *pixels = stbi_load_from_memory(
-        constData_Block(data), size_Block(data), &w, &h, &num, STBI_rgb_alpha);
+        constData_Block(data), (int) size_Block(data), &w, &h, &num, STBI_rgb_alpha);
     if (resized) {
         stbi_uc *rsPixels = malloc(num * resized * resized);
         stbir_resize_uint8(pixels, w, h, 0, rsPixels, resized, resized, 0, num);
@@ -560,6 +560,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
     d->splitMode              = 0;
     d->pendingSplitMode       = 0;
     d->pendingSplitUrl        = new_String();
+    d->pendingSplitOrigin     = new_String();
     d->place.initialPos       = rect.pos;
     d->place.normalRect       = rect;
     d->place.lastNotifiedSize = zero_I2();
@@ -605,6 +606,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 #endif
     setCurrent_Text(d->base.text);
     SDL_GetRendererOutputSize(d->base.render, &d->base.size.x, &d->base.size.y);
+    d->maxDrawableHeight = d->base.size.y;
     setupUserInterface_MainWindow(d);
     postCommand_App("~bindings.changed"); /* update from bindings */
     /* Load the border shadow texture. */ {
@@ -642,6 +644,7 @@ void deinit_MainWindow(iMainWindow *d) {
     if (theMainWindow_ == d) {
         theMainWindow_ = NULL;
     }
+    delete_String(d->pendingSplitOrigin);
     delete_String(d->pendingSplitUrl);
     deinit_Window(&d->base);
 }
@@ -1006,6 +1009,28 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
                 postCommand_App("media.player.update"); /* in case a player needs updating */
                 return iTrue;
             }
+            if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.sysframe") && mw) {
+                /* This command is sent on Android to update the keyboard height. */
+                const char *cmd = command_UserEvent(ev);
+                /*
+                    0
+                    |
+                 top
+                 |  |
+                 | bottom (top of keyboard)   :
+                 |  |                         : keyboardHeight
+                 maxDrawableHeight            :
+                    |
+                   fullheight
+                 */
+                const int top    = argLabel_Command(cmd, "top");
+                const int bottom = argLabel_Command(cmd, "bottom");
+                if (!SDL_IsScreenKeyboardShown(mw->base.win)) {
+                    mw->maxDrawableHeight = bottom - top;
+                }
+                setKeyboardHeight_MainWindow(mw, top + mw->maxDrawableHeight - bottom);
+                return iTrue;
+            }
             if (processEvent_Touch(&event)) {
                 return iTrue;
             }
@@ -1236,11 +1261,15 @@ void draw_MainWindow(iMainWindow *d) {
     isDrawing_ = iTrue;
     setCurrent_Text(d->base.text);
     /* Check if root needs resizing. */ {
+        const iBool wasPortrait = isPortrait_App();
         iInt2 renderSize;
         SDL_GetRendererOutputSize(w->render, &renderSize.x, &renderSize.y);
         if (!isEqual_I2(renderSize, w->size)) {
             updateSize_MainWindow_(d, iTrue);
             processEvents_App(postedEventsOnly_AppEventMode);
+            if (isPortrait_App() != wasPortrait) {
+                d->maxDrawableHeight = renderSize.y;
+            }
         }
     }
     const int   winFlags = SDL_GetWindowFlags(d->base.win);
@@ -1268,6 +1297,14 @@ void draw_MainWindow(iMainWindow *d) {
     }
     /* Draw widgets. */
     w->frameTime = SDL_GetTicks();
+    iForIndices(i, d->base.roots) {
+        iRoot *root = d->base.roots[i];
+        if (root) {
+            /* Some widgets may need a just-in-time visual update. */
+            notifyVisualOffsetChange_Root(root);
+            root->didChangeArrangement = iFalse;
+        }
+    }
     if (isExposed_Window(w)) {
         w->isInvalidated = iFalse;
         extern int drawCount_;
@@ -1442,6 +1479,7 @@ iBool isOpenGLRenderer_Window(void) {
 }
 
 void setKeyboardHeight_MainWindow(iMainWindow *d, int height) {
+    height = iMax(0, height);
     if (d->keyboardHeight != height) {
         d->keyboardHeight = height;
         postCommandf_App("keyboard.changed arg:%d", height);
@@ -1528,18 +1566,20 @@ void setSplitMode_MainWindow(iMainWindow *d, int splitFlags) {
                 }
             }
             if (!isEmpty_String(d->pendingSplitUrl)) {
-                postCommandf_Root(w->roots[newRootIndex], "open url:%s",
+                postCommandf_Root(w->roots[newRootIndex], "open origin:%s url:%s",
+                                  cstr_String(d->pendingSplitOrigin),
                                   cstr_String(d->pendingSplitUrl));
                 clear_String(d->pendingSplitUrl);
+                clear_String(d->pendingSplitOrigin);
             }
             else if (~splitFlags & noEvents_WindowSplit) {
                 iWidget *docTabs0 = findChild_Widget(w->roots[newRootIndex ^ 1]->widget, "doctabs");
                 iWidget *docTabs1 = findChild_Widget(w->roots[newRootIndex]->widget, "doctabs");
                 /* If the old root has multiple tabs, move the current one to the new split. */
                 if (tabCount_Widget(docTabs0) >= 2) {
-                    int movedIndex = tabPageIndex_Widget(docTabs0, moved);
+                    size_t movedIndex = tabPageIndex_Widget(docTabs0, moved);
                     removeTabPage_Widget(docTabs0, movedIndex);
-                    showTabPage_Widget(docTabs0, tabPage_Widget(docTabs0, iMax(movedIndex - 1, 0)));
+                    showTabPage_Widget(docTabs0, tabPage_Widget(docTabs0, iMax((int) movedIndex - 1, 0)));
                     iRelease(removeTabPage_Widget(docTabs1, 0)); /* delete the default tab */
                     setRoot_Widget(as_Widget(moved), w->roots[newRootIndex]);
                     prependTabPage_Widget(docTabs1, iClob(moved), "", 0, 0);
diff --git a/src/ui/window.h b/src/ui/window.h
index 6c921f09..b4e348d2 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -114,8 +114,10 @@ struct Impl_MainWindow {
     int           splitMode;
     int           pendingSplitMode;
     iString *     pendingSplitUrl; /* URL to open in a newly opened split */
+    iString *     pendingSplitOrigin; /* tab from where split was initiated, if any */
     SDL_Texture * appIcon;
-    int           keyboardHeight; /* mobile software keyboards */    
+    int           keyboardHeight; /* mobile software keyboards */
+    int           maxDrawableHeight;
 };
 
 iLocalDef enum iWindowType type_Window(const iAnyWindow *d) {
@@ -186,10 +188,10 @@ void        setKeyboardHeight_MainWindow    (iMainWindow *, int height);
 void        setSplitMode_MainWindow         (iMainWindow *, int splitMode);
 void        checkPendingSplit_MainWindow    (iMainWindow *);
 void        swapRoots_MainWindow            (iMainWindow *);
-void        showToolbars_MainWindow         (iMainWindow *, iBool show);
+//void        showToolbars_MainWindow         (iMainWindow *, iBool show);
 void        resize_MainWindow               (iMainWindow *, int w, int h);
 
-iBool       processEvent_MainWindow         (iMainWindow *, const SDL_Event *);
+//iBool       processEvent_MainWindow         (iMainWindow *, const SDL_Event *);
 void        draw_MainWindow                 (iMainWindow *);
 void        drawWhileResizing_MainWindow    (iMainWindow *, int w, int h); /* workaround for SDL bug */
 
diff --git a/src/visited.c b/src/visited.c
index 4552a053..83e09071 100644
--- a/src/visited.c
+++ b/src/visited.c
@@ -105,7 +105,7 @@ void load_Visited(iVisited *d, const char *dirPath) {
             char *endp = NULL;
             const unsigned long long ts = strtoull(line.start, &endp, 10);
             if (ts == 0) break;
-            const uint32_t flags = strtoul(skipSpace_CStr(endp), &endp, 16);
+            const uint32_t flags = (uint32_t) strtoul(skipSpace_CStr(endp), &endp, 16);
             const char *urlStart = skipSpace_CStr(endp);
             iVisitedUrl item;
             item.when.ts = (struct timespec){ .tv_sec = ts };