diff --git a/src/assets/plus.png b/src/assets/plus.png
index f588f272..5225e14b 100644
Binary files a/src/assets/plus.png and b/src/assets/plus.png differ
diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx
index 75542b96..8b46be55 100644
--- a/src/components/Activity.tsx
+++ b/src/components/Activity.tsx
@@ -5,7 +5,6 @@ import { createEffect, createSignal, For, Match, Show, Switch } from "solid-js";
 import shuffle from "~/assets/icons/shuffle.svg";
 import {
     ActivityDetailsModal,
-    ActivityItem,
     Card,
     HackActivityType,
     NiceP
@@ -44,11 +43,16 @@ export function UnifiedActivityItem(props: {
         return props.item.contacts[0];
     };
 
+    // TODO: figure out what other shit we should filter out
     const message = () => {
-        if (props.item.labels.length === 0) {
+        const filtered = props.item.labels.filter(
+            (l) => l !== "SWAP" && !l.startsWith("LN Channel:")
+        );
+        if (filtered.length === 0) {
             return undefined;
         }
-        return props.item.labels[0];
+
+        return filtered[0];
     };
 
     const shouldShowShuffle = () => {
@@ -69,6 +73,13 @@ export function UnifiedActivityItem(props: {
         if (props.item.labels.length > 0 && props.item.labels[0] === "SWAP") {
             return "swapped to";
         }
+        if (
+            props.item.labels.length > 0 &&
+            props.item.labels[0] === "Swept Force Close"
+        ) {
+            return undefined;
+        }
+
         return "sent";
     };
 
@@ -104,29 +115,34 @@ export function UnifiedActivityItem(props: {
 
     return (
         <>
-            <GenericItem
-                primaryAvatarUrl={
-                    shouldShowShuffle()
-                        ? shuffle
-                        : primaryContact()?.image_url || ""
-                }
-                primaryName={
-                    props.item.inbound
-                        ? primaryContact()?.name || "Unknown"
-                        : "You"
-                }
-                genericAvatar={shouldShowGeneric()}
-                verb={verb()}
-                message={message()}
-                secondaryName={secondaryName()}
-                amount={
-                    props.item.amount_sats
-                        ? BigInt(props.item.amount_sats || 0)
-                        : undefined
-                }
-                date={timeAgo(props.item.last_updated)}
-                accent={props.item.inbound ? "green" : undefined}
-            />
+            <button class="pt-3 first-of-type:pt-0" onClick={() => click()}>
+                <GenericItem
+                    primaryAvatarUrl={
+                        shouldShowShuffle()
+                            ? shuffle
+                            : primaryContact()?.image_url || ""
+                    }
+                    primaryName={
+                        props.item.inbound
+                            ? primaryContact()?.name || "Unknown"
+                            : "You"
+                    }
+                    genericAvatar={shouldShowGeneric()}
+                    verb={verb()}
+                    message={message()}
+                    secondaryName={secondaryName()}
+                    amount={
+                        props.item.amount_sats
+                            ? BigInt(props.item.amount_sats || 0)
+                            : undefined
+                    }
+                    date={timeAgo(props.item.last_updated)}
+                    accent={props.item.inbound ? "green" : undefined}
+                    visibility={
+                        props.item.kind === "Lightning" ? "private" : undefined
+                    }
+                />
+            </button>
             {/* <pre>{JSON.stringify(props.item, null, 2)}</pre> */}
         </>
         // <ActivityItem
@@ -143,7 +159,7 @@ export function UnifiedActivityItem(props: {
     );
 }
 
-export function CombinedActivity(props: { limit?: number }) {
+export function CombinedActivity() {
     const [state, _actions] = useMegaStore();
     const i18n = useI18n();
 
@@ -219,18 +235,6 @@ export function CombinedActivity(props: { limit?: number }) {
                         <NiceP>Don't forget to back up your seed words!</NiceP>
                     </Card>
                 </Match>
-                <Match when={props.limit && activity().length > props.limit}>
-                    <div class="flex w-full flex-col divide-y divide-m-grey-800 overflow-x-clip">
-                        <For each={activity().slice(0, props.limit)}>
-                            {(activityItem) => (
-                                <UnifiedActivityItem
-                                    item={activityItem}
-                                    onClick={openDetailsModal}
-                                />
-                            )}
-                        </For>
-                    </div>
-                </Match>
                 <Match when={activity().length >= 0}>
                     <div class="flex w-full flex-col divide-y divide-m-grey-800 overflow-x-clip">
                         <For each={activity()}>
@@ -244,15 +248,6 @@ export function CombinedActivity(props: { limit?: number }) {
                     </div>
                 </Match>
             </Switch>
-            {/* Only show on the home screen */}
-            <Show when={props.limit}>
-                <A
-                    href="/activity"
-                    class="self-center font-semibold text-m-red no-underline active:text-m-red/80"
-                >
-                    {i18n.t("activity.view_all")}
-                </A>
-            </Show>
         </>
     );
 }
diff --git a/src/components/ActivityDetailsModal.tsx b/src/components/ActivityDetailsModal.tsx
index 35edf512..50d31498 100644
--- a/src/components/ActivityDetailsModal.tsx
+++ b/src/components/ActivityDetailsModal.tsx
@@ -217,11 +217,13 @@ function LightningDetails(props: { info: MutinyInvoice; tags?: TagItem }) {
                         </TinyButton>
                     </KeyValue>
                 </Show>
-                <KeyValue key={i18n.t("activity.transaction_details.status")}>
-                    {props.info.paid
-                        ? i18n.t("activity.transaction_details.paid")
-                        : i18n.t("activity.transaction_details.unpaid")}
-                </KeyValue>
+                <Show when={!props.info.paid}>
+                    <KeyValue
+                        key={i18n.t("activity.transaction_details.status")}
+                    >
+                        i18n.t("activity.transaction_details.unpaid")
+                    </KeyValue>
+                </Show>
                 <KeyValue key={i18n.t("activity.transaction_details.date")}>
                     <FormatPrettyPrint ts={Number(props.info.last_updated)} />
                 </KeyValue>
@@ -235,12 +237,7 @@ function LightningDetails(props: { info: MutinyInvoice; tags?: TagItem }) {
                 <KeyValue key={i18n.t("activity.transaction_details.invoice")}>
                     <MiniStringShower text={props.info.bolt11 ?? ""} />
                 </KeyValue>
-                <KeyValue
-                    key={i18n.t("activity.transaction_details.payment_hash")}
-                >
-                    <MiniStringShower text={props.info.payment_hash ?? ""} />
-                </KeyValue>
-                <Show when={props.info.paid}>
+                <Show when={props.info.paid && !props.info.inbound}>
                     <KeyValue
                         key={i18n.t(
                             "activity.transaction_details.payment_preimage"
@@ -371,11 +368,6 @@ function OnchainDetails(props: {
                         "Pending"
                     )}
                 </KeyValue>
-                <Show when={props.kind === "ChannelOpen" && channelInfo()}>
-                    <KeyValue key={i18n.t("activity.transaction_details.peer")}>
-                        <MiniStringShower text={channelInfo()?.peer ?? ""} />
-                    </KeyValue>
-                </Show>
                 <KeyValue key={i18n.t("activity.transaction_details.txid")}>
                     <div class="flex gap-1">
                         {/* Have to do all these shenanigans because css / html is hard */}
diff --git a/src/components/ContactButton.tsx b/src/components/ContactButton.tsx
index 951b8b0e..02c6d1c4 100644
--- a/src/components/ContactButton.tsx
+++ b/src/components/ContactButton.tsx
@@ -8,13 +8,12 @@ export function ContactButton(props: {
     onClick: () => void;
 }) {
     return (
-        <div class="flex items-center gap-2">
+        <button class="flex items-center gap-2" onClick={() => props.onClick()}>
             <LabelCircle
                 name={props.contact.name}
                 image_url={props.contact.primal_image_url}
                 contact
                 label={false}
-                onClick={() => props.onClick()}
             />
             <div class="flex flex-1 flex-col items-start">
                 <h2 class="overflow-hidden overflow-ellipsis text-base font-semibold">
@@ -24,6 +23,6 @@ export function ContactButton(props: {
                     {props.contact.ln_address || ""}
                 </h3>
             </div>
-        </div>
+        </button>
     );
 }
diff --git a/src/components/ContactViewer.tsx b/src/components/ContactViewer.tsx
index 2592c7ae..c68eb401 100644
--- a/src/components/ContactViewer.tsx
+++ b/src/components/ContactViewer.tsx
@@ -11,7 +11,6 @@ import {
     MiniStringShower,
     showToast,
     SimpleDialog,
-    SmallHeader,
     VStack
 } from "~/components";
 import { useI18n } from "~/i18n/context";
diff --git a/src/components/Fab.tsx b/src/components/Fab.tsx
index 7e87c1d7..ad377b8c 100644
--- a/src/components/Fab.tsx
+++ b/src/components/Fab.tsx
@@ -33,10 +33,10 @@ export function FabMenu(props: {
     return (
         <nav
             ref={(el) => (navRef = el)}
-            class="fixed bottom-[calc(2rem+5rem)]  rounded-xl bg-neutral-700/30 px-2 backdrop-blur-lg"
+            class="fixed rounded-xl bg-neutral-700/30 px-2 backdrop-blur-lg"
             classList={{
-                "right-8": props.right,
-                "left-8": props.left
+                "right-8 bottom-[calc(2rem+5rem)]": props.right,
+                "left-4 bottom-[calc(2rem+2rem)]": props.left
             }}
         >
             {props.children}
diff --git a/src/components/GenericItem.tsx b/src/components/GenericItem.tsx
index 1f49b3f8..0159ebce 100644
--- a/src/components/GenericItem.tsx
+++ b/src/components/GenericItem.tsx
@@ -6,20 +6,20 @@ import redClose from "~/assets/icons/red-close.svg";
 import { Clock } from "~/assets/svg/Clock";
 import { Globe } from "~/assets/svg/Globe";
 import { PrivateEye } from "~/assets/svg/Private";
-import { LabelCircle, LoadingSpinner, SharpButton } from "~/components";
+import { LabelCircle, LoadingSpinner } from "~/components";
 
 export function GenericItem(props: {
     primaryAvatarUrl: string;
     secondaryAvatarUrl?: string;
     primaryName: string;
     secondaryName?: string;
-    verb: string;
+    verb?: string;
     amount?: bigint;
     date?: string;
     due?: string;
     message?: string;
     accent?: "green";
-    public?: boolean;
+    visibility?: "public" | "private";
     showFiat?: boolean;
     genericAvatar?: boolean;
     forceSecondary?: boolean;
@@ -48,21 +48,23 @@ export function GenericItem(props: {
                     onClick={props.primaryOnClick}
                 />
             </div>
-            <div class="flex flex-col items-start gap-1 px-2">
+            <div class="flex flex-col items-start justify-center gap-1 self-center px-2">
                 {/* TITLE TEXT */}
-                <h2 class="text-sm">
-                    <strong
-                        classList={{
-                            "text-m-grey-400": props.genericAvatar
-                        }}
-                    >
-                        {props.primaryName}
-                    </strong>
-                    <span class="font-light">{` ${props.verb} `}</span>
-                    <Show when={props.secondaryName}>
-                        <strong>{props.secondaryName}</strong>
-                    </Show>
-                </h2>
+                <Show when={props.primaryName && props.verb}>
+                    <h2 class="text-sm">
+                        <strong
+                            classList={{
+                                "text-m-grey-400": props.genericAvatar
+                            }}
+                        >
+                            {props.primaryName}
+                        </strong>
+                        <span class="font-light">{` ${props.verb} `}</span>
+                        <Show when={props.secondaryName}>
+                            <strong>{props.secondaryName}</strong>
+                        </Show>
+                    </h2>
+                </Show>
                 <div class="flex flex-wrap gap-1">
                     {/* AMOUNT */}
                     <Show when={props.amount}>
@@ -102,11 +104,11 @@ export function GenericItem(props: {
                 {/* DATE WITH SECOND AVATAR */}
                 <Show when={props.date}>
                     <div class="flex items-center gap-1 text-m-grey-400">
-                        <Show when={props.public}>
+                        <Show when={props.visibility === "public"}>
                             {/* <img src={globe} width={12} height={12} /> */}
                             <Globe />
                         </Show>
-                        <Show when={!props.public}>
+                        <Show when={props.visibility === "private"}>
                             <PrivateEye />
                             {/* <img src={privateEye} width={12} height={12} /> */}
                         </Show>
@@ -151,19 +153,19 @@ export function GenericItem(props: {
                     >
                         <div class="flex gap-4">
                             <button
-                                class="rounded border-b border-t border-b-white/10 border-t-white/50 bg-m-grey-750 active:-mb-[1px] active:mt-[1px]"
+                                class="flex h-10 w-10 items-center justify-center rounded border-b border-t border-b-white/10 border-t-white/50 bg-m-grey-750 p-1 active:-mb-[1px] active:mt-[1px]"
                                 onClick={() =>
                                     props.approveAction && props.approveAction()
                                 }
                             >
                                 <img
-                                    class="h-[1.5rem] w-[1.5rem]"
+                                    class="h-[2rem] w-[2rem]"
                                     src={greenCheck}
                                     alt="Approve"
                                 />
                             </button>
                             <button
-                                class="rounded border-b border-t border-b-white/10 border-t-white/50 bg-m-grey-750 active:-mb-[1px] active:mt-[1px]"
+                                class="flex h-10 w-10 items-center justify-center rounded border-b border-t border-b-white/10 border-t-white/50 bg-m-grey-750 p-1 active:-mb-[1px] active:mt-[1px]"
                                 onClick={() =>
                                     props.rejectAction && props.rejectAction()
                                 }
diff --git a/src/components/HomeSubnav.tsx b/src/components/HomeSubnav.tsx
index 8bee2bae..89965f8c 100644
--- a/src/components/HomeSubnav.tsx
+++ b/src/components/HomeSubnav.tsx
@@ -1,4 +1,10 @@
-import { createSignal, Show, Suspense } from "solid-js";
+import {
+    createEffect,
+    createResource,
+    createSignal,
+    Show,
+    Suspense
+} from "solid-js";
 
 import {
     CombinedActivity,
@@ -18,6 +24,23 @@ export function HomeSubnav() {
         "me" | "everybody" | "requests"
     >("me");
 
+    const [pending, { refetch }] = createResource(async () => {
+        try {
+            const pending =
+                await state.mutiny_wallet?.get_pending_nwc_invoices();
+            return pending?.length || 0;
+        } catch (e) {
+            console.error(e);
+            return 0;
+        }
+    });
+
+    createEffect(() => {
+        if (state.is_syncing) {
+            refetch();
+        }
+    });
+
     return (
         <>
             <div class="flex gap-2">
@@ -44,7 +67,7 @@ export function HomeSubnav() {
                 </button>
 
                 <button
-                    class="rounded px-2 py-1 text-sm"
+                    class="flex items-center gap-1 rounded px-2 py-1 text-sm"
                     classList={{
                         "bg-m-red": activeView() === "requests",
                         "bg-m-grey-800 text-m-grey-400":
@@ -52,7 +75,19 @@ export function HomeSubnav() {
                     }}
                     onClick={() => setActiveView("requests")}
                 >
-                    Requests
+                    <span>Requests </span>
+                    <Suspense fallback={<></>}>
+                        <Show when={pending.latest && pending.latest > 0}>
+                            <span
+                                class="inline-flex h-5 w-5 items-center justify-center rounded-full bg-white/20 text-xs"
+                                classList={{
+                                    "text-white": !!((pending.latest || 0) > 0)
+                                }}
+                            >
+                                {pending()}
+                            </span>
+                        </Show>
+                    </Suspense>
                 </button>
             </div>
 
diff --git a/src/components/NostrActivity.tsx b/src/components/NostrActivity.tsx
index 723f42f8..3d5f1996 100644
--- a/src/components/NostrActivity.tsx
+++ b/src/components/NostrActivity.tsx
@@ -9,9 +9,8 @@ import {
     Switch
 } from "solid-js";
 
-import avatar from "~/assets/generic-avatar.jpg";
 import rightArrow from "~/assets/icons/right-arrow.svg";
-import { AmountSats, VStack } from "~/components";
+import { AmountSats } from "~/components";
 import { useI18n } from "~/i18n/context";
 import { useMegaStore } from "~/state/megaStore";
 import { fetchZaps, getPrimalImageUrl, hexpubFromNpub } from "~/utils";
@@ -153,7 +152,9 @@ export function NostrActivity() {
                             amount={zap.amount_sats}
                             message={zap.content ? zap.content : undefined}
                             date={timeAgo(zap.timestamp, data.latest?.until)}
-                            public={zap.kind === "public"}
+                            visibility={
+                                zap.kind === "public" ? "public" : "private"
+                            }
                             genericAvatar={
                                 zap.kind === "anonymous" ||
                                 zap.kind === "private"
diff --git a/src/components/PendingNwc.tsx b/src/components/PendingNwc.tsx
index f28aa823..9bcdf931 100644
--- a/src/components/PendingNwc.tsx
+++ b/src/components/PendingNwc.tsx
@@ -81,11 +81,13 @@ export function PendingNwc() {
         { storage: createDeepSignal }
     );
 
-    const [paying, setPaying] = createSignal<string>("");
+    // const [paying, setPaying] = createSignal<string>("");
+    const [payList, setPayList] = createSignal<string[]>([]);
 
     async function payItem(item: PendingItem) {
         try {
-            setPaying(item.id);
+            // setPaying(item.id);
+            setPayList([...payList(), item.id]);
             await state.mutiny_wallet?.approve_invoice(item.id);
             await vibrateSuccess();
         } catch (e) {
@@ -104,7 +106,7 @@ export function PendingNwc() {
                 console.error(e);
             }
         } finally {
-            setPaying("");
+            setPayList(payList().filter((id) => id !== item.id));
             refetch();
         }
     }
@@ -130,13 +132,13 @@ export function PendingNwc() {
 
     async function rejectItem(item: PendingItem) {
         try {
-            setPaying(item.id);
+            setPayList([...payList(), item.id]);
             await state.mutiny_wallet?.deny_invoice(item.id);
         } catch (e) {
             setError(eify(e));
             console.error(e);
         } finally {
-            setPaying("");
+            setPayList(payList().filter((id) => id !== item.id));
             refetch();
         }
     }
@@ -207,7 +209,9 @@ export function PendingNwc() {
                                 primaryName={pendingItem.name_of_connection}
                                 approveAction={() => payItem(pendingItem)}
                                 rejectAction={() => rejectItem(pendingItem)}
-                                shouldSpinny={paying() === pendingItem.id}
+                                shouldSpinny={payList().includes(
+                                    pendingItem.id
+                                )}
                             />
                         )}
                     </For>
diff --git a/src/components/ReceiveWarnings.tsx b/src/components/ReceiveWarnings.tsx
index aa4d2dd1..835477eb 100644
--- a/src/components/ReceiveWarnings.tsx
+++ b/src/components/ReceiveWarnings.tsx
@@ -7,7 +7,7 @@ import { useMegaStore } from "~/state/megaStore";
 
 export function ReceiveWarnings(props: {
     amountSats: string | bigint;
-    from_fedi_to_ln: boolean;
+    from_fedi_to_ln?: boolean;
 }) {
     const i18n = useI18n();
     const [state, _actions] = useMegaStore();
@@ -29,7 +29,7 @@ export function ReceiveWarnings(props: {
     });
 
     const warningText = () => {
-        if (state.federations?.length !== 0 && props.from_fedi_to_ln != true) {
+        if (state.federations?.length !== 0 && props.from_fedi_to_ln !== true) {
             return undefined;
         }
         if ((state.balance?.lightning || 0n) === 0n) {
diff --git a/src/components/layout/BackButton.tsx b/src/components/layout/BackButton.tsx
index fd4455b4..1cc0529a 100644
--- a/src/components/layout/BackButton.tsx
+++ b/src/components/layout/BackButton.tsx
@@ -10,11 +10,11 @@ export function BackButton(props: {
     return (
         <button
             onClick={() => props.onClick()}
-            class="flex items-center text-xl font-semibold text-m-red no-underline active:text-m-red/80 md:hidden"
+            class="flex items-center text-xl font-semibold text-white no-underline active:-mb-[1px] active:mt-[1px] active:text-white/80 md:hidden"
             classList={{ "md:!flex": props.showOnDesktop }}
         >
             <Back />
-            {props.title ? props.title : i18n.t("common.home")}
+            {props.title !== undefined ? props.title : i18n.t("common.home")}
         </button>
     );
 }
diff --git a/src/components/layout/BackLink.tsx b/src/components/layout/BackLink.tsx
index d2759b23..556dcb63 100644
--- a/src/components/layout/BackLink.tsx
+++ b/src/components/layout/BackLink.tsx
@@ -8,7 +8,7 @@ export function BackLink(props: { href?: string; title?: string }) {
     return (
         <A
             href={props.href ? props.href : "/"}
-            class="flex items-center text-xl font-semibold text-m-red no-underline active:text-m-red/80 md:hidden"
+            class="flex items-center text-xl font-semibold text-white no-underline active:-mb-[1px] active:mt-[1px] active:text-white/80 md:hidden"
         >
             <Back />
             {props.title ? props.title : i18n.t("common.home")}
diff --git a/src/components/layout/BackPop.tsx b/src/components/layout/BackPop.tsx
index 2673c3aa..b5f57493 100644
--- a/src/components/layout/BackPop.tsx
+++ b/src/components/layout/BackPop.tsx
@@ -8,7 +8,7 @@ export type StateWithPrevious = {
     previous?: string;
 };
 
-export function BackPop(props: { default?: string }) {
+export function BackPop(props: { default?: string; title?: string }) {
     const i18n = useI18n();
     const navigate = useNavigate();
     const location = useLocation();
@@ -30,9 +30,11 @@ export function BackPop(props: { default?: string }) {
     return (
         <BackButton
             title={
-                backPath() === "/"
-                    ? i18n.t("common.home")
-                    : i18n.t("common.back")
+                props.title !== undefined
+                    ? props.title
+                    : backPath() === "/"
+                      ? i18n.t("common.home")
+                      : i18n.t("common.back")
             }
             onClick={() => navigate(backPath())}
             showOnDesktop
diff --git a/src/routes/Activity.tsx b/src/routes/Activity.tsx
deleted file mode 100644
index d32e9c97..00000000
--- a/src/routes/Activity.tsx
+++ /dev/null
@@ -1,196 +0,0 @@
-import { Tabs } from "@kobalte/core";
-import { TagItem } from "@mutinywallet/mutiny-wasm";
-import {
-    createEffect,
-    createResource,
-    ErrorBoundary,
-    For,
-    Match,
-    Show,
-    Suspense,
-    Switch
-} from "solid-js";
-
-import {
-    BackLink,
-    Card,
-    CombinedActivity,
-    ContactEditor,
-    ContactFormValues,
-    ContactViewer,
-    DefaultMain,
-    LargeHeader,
-    LoadingShimmer,
-    MutinyWalletGuard,
-    NavBar,
-    NiceP,
-    NostrActivity,
-    SafeArea,
-    showToast,
-    SimpleErrorDisplay,
-    SyncContactsForm,
-    VStack
-} from "~/components";
-import { useI18n } from "~/i18n/context";
-import { useMegaStore } from "~/state/megaStore";
-import { eify, gradientsPerContact, hexpubFromNpub } from "~/utils";
-
-function ContactRow() {
-    const [state, _actions] = useMegaStore();
-    const [contacts, { refetch }] = createResource(async () => {
-        try {
-            const contacts: TagItem[] =
-                state.mutiny_wallet?.get_contacts_sorted();
-            return contacts || [];
-        } catch (e) {
-            console.error(e);
-            return [];
-        }
-    });
-
-    // If the user sets an npub we should refetch the contacts list
-    createEffect(() => {
-        if (state.npub) {
-            refetch();
-        }
-    });
-    const [gradients] = createResource(contacts, gradientsPerContact);
-
-    async function createContact(contact: ContactFormValues) {
-        try {
-            await state.mutiny_wallet?.create_new_contact(
-                contact.name,
-                contact.npub ? contact.npub.trim() : undefined,
-                contact.ln_address ? contact.ln_address.trim() : undefined,
-                undefined,
-                undefined
-            );
-        } catch (e) {
-            console.error(e);
-        }
-        refetch();
-    }
-
-    async function saveContact(id: string, contact: ContactFormValues) {
-        console.log("saving contact", id, contact);
-        const hexpub = await hexpubFromNpub(contact.npub?.trim());
-        try {
-            const existing = state.mutiny_wallet?.get_tag_item(id);
-            // This shouldn't happen
-            if (!existing) throw new Error("No existing contact");
-            await state.mutiny_wallet?.edit_contact(
-                id,
-                contact.name,
-                hexpub ? hexpub : undefined,
-                contact.ln_address ? contact.ln_address.trim() : undefined,
-                existing.lnurl,
-                existing.image_url
-            );
-        } catch (e) {
-            console.error(e);
-            showToast(eify(e));
-        }
-
-        refetch();
-    }
-
-    async function deleteContact(id: string) {
-        try {
-            await state.mutiny_wallet?.delete_contact(id);
-        } catch (e) {
-            console.error(e);
-            showToast(eify(e));
-        }
-        refetch();
-    }
-
-    return (
-        <div class="flex gap-4">
-            <ContactEditor list createContact={createContact} />
-            <Show when={contacts()}>
-                <div class="flex flex-1 gap-4 overflow-x-scroll disable-scrollbars">
-                    <For each={contacts()}>
-                        {(contact) => (
-                            <ContactViewer
-                                contact={contact}
-                                gradient={gradients()?.get(contact.name)}
-                                saveContact={saveContact}
-                                deleteContact={deleteContact}
-                            />
-                        )}
-                    </For>
-                </div>
-            </Show>
-        </div>
-    );
-}
-
-const TAB =
-    "flex-1 inline-block px-8 py-4 text-lg font-semibold rounded-lg ui-selected:bg-white/10 bg-neutral-950 hover:bg-white/10";
-
-export function Activity() {
-    const i18n = useI18n();
-    const [state, _actions] = useMegaStore();
-    return (
-        <MutinyWalletGuard>
-            <SafeArea>
-                <DefaultMain>
-                    <BackLink />
-                    <LargeHeader>{i18n.t("activity.title")}</LargeHeader>
-                    <ContactRow />
-                    <Tabs.Root defaultValue="mutiny">
-                        <Tabs.List class="relative mb-8 mt-4 flex justify-around gap-1 rounded-xl bg-neutral-950 p-1">
-                            <Tabs.Trigger value="wallet" class={TAB}>
-                                {i18n.t("activity.wallet")}
-                            </Tabs.Trigger>
-                            <Tabs.Trigger value="nostr" class={TAB}>
-                                {i18n.t("activity.nostr")}
-                            </Tabs.Trigger>
-                            {/* <Tabs.Indicator class="absolute bg-m-blue transition-all bottom-[-1px] h-[2px]" /> */}
-                        </Tabs.List>
-                        <Tabs.Content value="wallet">
-                            {/* <MutinyActivity /> */}
-                            <Card title={i18n.t("activity.title")}>
-                                <div class="p-1" />
-                                <VStack>
-                                    <Suspense>
-                                        <Show
-                                            when={!state.wallet_loading}
-                                            fallback={<LoadingShimmer />}
-                                        >
-                                            <CombinedActivity />
-                                        </Show>
-                                    </Suspense>
-                                </VStack>
-                            </Card>
-                        </Tabs.Content>
-                        <Tabs.Content value="nostr">
-                            <Switch>
-                                <Match when={state.npub}>
-                                    <ErrorBoundary
-                                        fallback={(e) => (
-                                            <SimpleErrorDisplay error={e} />
-                                        )}
-                                    >
-                                        <Suspense fallback={<LoadingShimmer />}>
-                                            <NostrActivity />
-                                        </Suspense>
-                                    </ErrorBoundary>
-                                </Match>
-                                <Match when={!state.npub}>
-                                    <VStack>
-                                        <NiceP>
-                                            {i18n.t("activity.import_contacts")}
-                                        </NiceP>
-                                        <SyncContactsForm />
-                                    </VStack>
-                                </Match>
-                            </Switch>
-                        </Tabs.Content>
-                    </Tabs.Root>
-                </DefaultMain>
-                {/* <NavBar activeTab="activity" /> */}
-            </SafeArea>
-        </MutinyWalletGuard>
-    );
-}
diff --git a/src/routes/Chat.tsx b/src/routes/Chat.tsx
index 8d1d6079..f2e762d3 100644
--- a/src/routes/Chat.tsx
+++ b/src/routes/Chat.tsx
@@ -1,10 +1,7 @@
-/* refresh skip */
-
 import { TagItem } from "@mutinywallet/mutiny-wasm";
 import { createAsync, useNavigate, useParams } from "@solidjs/router";
 import {
     createEffect,
-    createMemo,
     createResource,
     createSignal,
     For,
@@ -15,12 +12,10 @@ import {
     Suspense,
     Switch
 } from "solid-js";
-import { Transition } from "solid-transition-group";
 
 import bolt from "~/assets/icons/bolt.svg";
 import receive from "~/assets/icons/receive.svg";
 import send from "~/assets/icons/send.svg";
-import plus from "~/assets/plus.png";
 import {
     ActivityDetailsModal,
     AmountSats,
@@ -41,7 +36,7 @@ import {
 import { MiniFab } from "~/components/Fab";
 import { ParsedParams, toParsedParams } from "~/logic/waila";
 import { useMegaStore } from "~/state/megaStore";
-import { createDeepSignal, eify, hexpubFromNpub, timeAgo } from "~/utils";
+import { eify, hexpubFromNpub, timeAgo } from "~/utils";
 
 type CombinedMessagesAndActivity =
     | { kind: "message"; content: FakeDirectMessage }
@@ -55,6 +50,14 @@ type FakeDirectMessage = {
     date: number;
 };
 
+function isActivityItem(content: unknown): content is IActivityItem {
+    return (content as IActivityItem).last_updated !== undefined;
+}
+
+function isDirectMessage(content: unknown): content is FakeDirectMessage {
+    return (content as FakeDirectMessage).date !== undefined;
+}
+
 function SingleMessage(props: {
     dm: FakeDirectMessage;
     counterPartyNpub: string;
@@ -215,7 +218,7 @@ function MessageList(props: {
         <>
             <div class="flex flex-col-reverse justify-end gap-4">
                 <For each={props.convo}>
-                    {(combined, index) => (
+                    {(combined, _index) => (
                         <>
                             <Show when={combined.kind === "activity"}>
                                 <div
@@ -276,11 +279,12 @@ export function Chat() {
         contact,
         async (contact: TagItem, info) => {
             // if (!contact() || !contact()?.npub) return undefined;
-            if (!contact.npub) return [];
+            if (!contact.npub) return [] as CombinedMessagesAndActivity[];
             try {
                 const activity = await state.mutiny_wallet?.get_label_activity(
                     params.id
                 );
+
                 console.log("activity", activity);
                 const refetchingTimestamp = info.refetching as bigint;
                 console.log("refetching since", refetchingTimestamp);
@@ -320,7 +324,8 @@ export function Chat() {
                         return lastConvo;
                     } else {
                         console.log("new messages or activity");
-                        dms.push(convo);
+                        // dms.push(lastConvo);
+                        // dms.push(convo);
                     }
                 }
 
@@ -339,35 +344,47 @@ export function Chat() {
                 ];
 
                 combined.sort((a, b) => {
-                    let a_time = 0;
-                    let b_time = 0;
-                    if (a.kind === "message") {
-                        const a_msg = a.content as FakeDirectMessage;
-                        a_time = a_msg.date;
-                    } else {
-                        const a_act = a.content as IActivityItem;
-                        a_time = a_act.last_updated;
-                    }
-
-                    if (b.kind === "message") {
-                        const b_msg = b.content as FakeDirectMessage;
-                        b_time = b_msg.date;
-                    } else {
-                        const b_act = b.content as IActivityItem;
-                        b_time = b_act.last_updated;
-                    }
-
-                    return b_time - a_time;
+                    // let a_time = 0;
+                    // let b_time = 0;
+                    // if (a.kind === "message") {
+                    //     const a_msg = a.content as FakeDirectMessage;
+                    //     a_time = a_msg.date;
+                    // } else {
+                    //     const a_act = a.content as IActivityItem;
+                    //     a_time = a_act.last_updated;
+                    // }
+
+                    // if (b.kind === "message") {
+                    //     const b_msg = b.content as FakeDirectMessage;
+                    //     b_time = b_msg.date;
+                    // } else {
+                    //     const b_act = b.content as IActivityItem;
+                    //     b_time = b_act.last_updated;
+                    // }
+
+                    // return b_time - a_time;
+
+                    const a_time = isDirectMessage(a.content)
+                        ? a.content.date
+                        : isActivityItem(a.content)
+                          ? a.content.last_updated
+                          : 0;
+                    const b_time = isDirectMessage(b.content)
+                        ? b.content.date
+                        : isActivityItem(b.content)
+                          ? b.content.last_updated
+                          : 0;
+
+                    return b_time - a_time; // Descending order
                 });
 
+                console.log("combined activity", combined);
+
                 return combined as CombinedMessagesAndActivity[];
             } catch (e) {
                 console.error("error getting convo:", e);
-                return [];
+                return [] as CombinedMessagesAndActivity[];
             }
-        },
-        {
-            storage: createDeepSignal
         }
     );
 
@@ -474,42 +491,14 @@ export function Chat() {
     }
 
     return (
-        <Transition
-            mode="outin"
-            onBeforeEnter={(el) => {
-                if (el instanceof HTMLElement) el.style.opacity = "100";
-            }}
-            onEnter={(el, done) => {
-                el.animate(
-                    [
-                        { transform: "translate(50vw)" },
-                        { transform: "translate(0)" }
-                    ],
-                    { duration: 100, fill: "both" }
-                )
-                    .finished.then(done)
-                    .catch(done);
-            }}
-            onExit={(el, done) => {
-                el.animate(
-                    [
-                        { transform: `translate(0)` },
-                        { transform: "translate(-50vw)" }
-                    ],
-                    { duration: 100 }
-                )
-                    .finished.then(done)
-                    .catch(done);
-            }}
-        >
-            <MutinyWalletGuard>
-                <main class="mx-auto grid h-[100dvh] w-full max-w-[600px] grid-cols-1 grid-rows-[minmax(10px,1fr)_4rem] flex-col overflow-y-hidden safe-top safe-bottom">
-                    <div class="overflow-y-auto">
-                        <div class="fixed top-0 z-50 flex w-full flex-col gap-2 bg-m-grey-975/70 p-4 backdrop-blur-lg">
-                            {/* <BackLink href="/" /> */}
-                            <BackPop default="/search" />
-                            <Show when={contact()}>
-                                <div class="flex w-full flex-col gap-2">
+        <MutinyWalletGuard>
+            <main class="mx-auto grid h-[100dvh] w-full max-w-[600px] grid-cols-1 grid-rows-[minmax(10px,1fr)_4rem] flex-col overflow-y-hidden safe-top safe-bottom">
+                <div class="overflow-y-auto">
+                    <div class="fixed top-0 z-50 flex w-full flex-col gap-2 bg-m-grey-975/70 p-4 backdrop-blur-lg">
+                        <div class="flex w-full flex-col gap-2">
+                            <div class="flex items-center gap-2">
+                                <BackPop default="/" title="" />
+                                <Show when={contact()}>
                                     <ContactViewer
                                         contact={contact()!}
                                         saveContact={saveContact}
@@ -520,83 +509,89 @@ export function Chat() {
                                             onClick={() => {}}
                                         />
                                     </ContactViewer>
-                                    <div class="flex w-full gap-4 text-xs">
-                                        <SharpButton onClick={() => {}}>
-                                            <img
-                                                src={send}
-                                                width={"16px"}
-                                                height={"16px"}
-                                            />
-                                            <span>Send</span>
-                                        </SharpButton>
-                                        <SharpButton onClick={() => {}}>
-                                            <img
-                                                src={receive}
-                                                width={"16px"}
-                                                height={"16px"}
-                                            />
-
-                                            <span>Request</span>
-                                        </SharpButton>
-                                        <SharpButton onClick={() => {}}>
-                                            Edit
-                                        </SharpButton>{" "}
-                                    </div>
-                                </div>
-                            </Show>
-                        </div>
-                        <div class="h-[8rem]" />
-                        {/* <pre class="whitespace-pre-wrap break-all">
-                            {JSON.stringify(convo(), null, 2)}
-                        </pre> */}
-                        <div class="p-4">
-                            <Suspense>
-                                <Show when={contact()}>
-                                    <Suspense fallback={<LoadingShimmer />}>
-                                        <Show when={convo.latest}>
-                                            <MessageList
-                                                convo={convo.latest}
-                                                contact={contact()!}
-                                            />
-                                        </Show>
-                                    </Suspense>
                                 </Show>
-                            </Suspense>
-                            {/* <div class="h-[2rem]" /> */}
+                            </div>
+                            <div class="flex w-full gap-4 text-xs">
+                                <SharpButton
+                                    onClick={() => {
+                                        sendToContact(contact());
+                                    }}
+                                >
+                                    <img
+                                        src={send}
+                                        width={"16px"}
+                                        height={"16px"}
+                                    />
+                                    <span>Send</span>
+                                </SharpButton>
+                                <SharpButton
+                                    onClick={() =>
+                                        requestFromContact(contact())
+                                    }
+                                >
+                                    <img
+                                        src={receive}
+                                        width={"16px"}
+                                        height={"16px"}
+                                    />
+
+                                    <span>Request</span>
+                                </SharpButton>
+                            </div>
                         </div>
                     </div>
-                    <div class="grid grid-cols-[auto_1fr_auto] grid-rows-1 items-center gap-2 p-2">
-                        {/* TODO handle onscan */}
-                        <MiniFab
-                            onScan={() => {}}
-                            onSend={() => {
-                                sendToContact(contact());
-                            }}
-                            onRequest={() => requestFromContact(contact())}
-                        />
-                        <SimpleInput
-                            disabled={sending()}
-                            value={messageValue()}
-                            onInput={(e) =>
-                                setMessageValue(e.currentTarget.value)
-                            }
-                            placeholder="Message"
-                        />
-                        <div>
-                            <Show when={messageValue()}>
-                                <Button
-                                    layout="xs"
-                                    intent="blue"
-                                    loading={sending()}
-                                    onClick={sendMessage}
-                                >
-                                    Send
-                                </Button>
+                    <div class="h-[8rem]" />
+                    {/* <pre class="whitespace-pre-wrap break-all">
+                            {JSON.stringify(convo(), null, 2)}
+                        </pre> */}
+                    <div class="p-4">
+                        <Suspense>
+                            <Show when={contact()}>
+                                <Suspense fallback={<LoadingShimmer />}>
+                                    <Show when={convo.latest}>
+                                        {/* TODO: figure out how not to do typecasting here */}
+                                        <MessageList
+                                            convo={
+                                                convo.latest as CombinedMessagesAndActivity[]
+                                            }
+                                            contact={contact()!}
+                                        />
+                                    </Show>
+                                </Suspense>
                             </Show>
-                        </div>
+                        </Suspense>
+                        {/* <div class="h-[2rem]" /> */}
+                    </div>
+                </div>
+                <div class="grid grid-cols-[auto_1fr_auto] grid-rows-1 items-center gap-2 p-2">
+                    {/* TODO handle onscan */}
+                    <MiniFab
+                        onScan={() => {}}
+                        onSend={() => {
+                            sendToContact(contact());
+                        }}
+                        onRequest={() => requestFromContact(contact())}
+                    />
+                    <SimpleInput
+                        disabled={sending()}
+                        value={messageValue()}
+                        onInput={(e) => setMessageValue(e.currentTarget.value)}
+                        placeholder="Message"
+                    />
+                    <div>
+                        <Show when={messageValue()}>
+                            <Button
+                                layout="xs"
+                                intent="blue"
+                                loading={sending()}
+                                onClick={sendMessage}
+                            >
+                                Send
+                            </Button>
+                        </Show>
                     </div>
-                </main>
-            </MutinyWalletGuard>
-        </Transition>
+                </div>
+            </main>
+        </MutinyWalletGuard>
     );
 }
diff --git a/src/routes/Main.tsx b/src/routes/Main.tsx
index c2143dcb..00581e95 100644
--- a/src/routes/Main.tsx
+++ b/src/routes/Main.tsx
@@ -1,11 +1,6 @@
 import { createAsync, useNavigate } from "@solidjs/router";
 import { createMemo, createSignal, Show, Suspense } from "solid-js";
 
-import receive from "~/assets/icons/receive.svg";
-import scan from "~/assets/icons/scan.svg";
-import send from "~/assets/icons/send.svg";
-import plus from "~/assets/plus.png";
-import wave from "~/assets/wave.gif";
 import {
     BalanceBox,
     BetaWarningModal,
diff --git a/src/routes/Profile.tsx b/src/routes/Profile.tsx
index 7170060c..18f15bae 100644
--- a/src/routes/Profile.tsx
+++ b/src/routes/Profile.tsx
@@ -6,8 +6,10 @@ import {
     BackLink,
     BalanceBox,
     DefaultMain,
+    FancyCard,
+    KeyValue,
     LabelCircle,
-    LargeHeader,
+    MiniStringShower,
     MutinyWalletGuard,
     NavBar,
     SafeArea
@@ -57,9 +59,7 @@ export function Profile() {
                             <p class="break-all text-center font-system-mono text-base text-m-grey-350">
                                 {profile().lud16}
                             </p>
-                            <p class="max-w-[15rem] break-all text-center font-system-mono text-base text-m-grey-350">
-                                {npub()}
-                            </p>
+
                             <div class="w-[10rem] rounded bg-white p-[1rem]">
                                 <QRCodeSVG
                                     value={profile().lud16}
@@ -85,6 +85,11 @@ export function Profile() {
                     </div>
                     {/* <LargeHeader>Accounts</LargeHeader> */}
                     <BalanceBox loading={state.wallet_loading} />
+                    <FancyCard title="Nostr">
+                        <KeyValue key="npub">
+                            <MiniStringShower text={npub() || ""} />
+                        </KeyValue>
+                    </FancyCard>
                     <div class="h-4" />
                 </DefaultMain>
                 <NavBar activeTab="settings" />
diff --git a/src/routes/Request.tsx b/src/routes/Request.tsx
index ad0b95a6..8d101bc7 100644
--- a/src/routes/Request.tsx
+++ b/src/routes/Request.tsx
@@ -1,11 +1,9 @@
-/* @refresh skip */
-
 import { useNavigate, useParams } from "@solidjs/router";
 import { createResource, createSignal, Suspense } from "solid-js";
 
 import {
     AmountEditable,
-    BackButton,
+    BackPop,
     Button,
     DefaultMain,
     LabelCircle,
@@ -35,8 +33,6 @@ export function RequestRoute() {
 
     const [loading, setLoading] = createSignal(false);
 
-    function handleBack() {}
-
     async function handleSubmit() {
         setLoading(true);
         console.log("requesting", amount(), whatForInput());
@@ -84,7 +80,7 @@ export function RequestRoute() {
     return (
         <MutinyWalletGuard>
             <DefaultMain>
-                <BackButton onClick={handleBack} showOnDesktop />
+                <BackPop default={"/"} />
                 <LargeHeader>{i18n.t("request.request_bitcoin")}</LargeHeader>
                 <Suspense>
                     <DestinationItem
diff --git a/src/routes/Scratchpad.tsx b/src/routes/Scratchpad.tsx
index 794e9399..e9f073a8 100644
--- a/src/routes/Scratchpad.tsx
+++ b/src/routes/Scratchpad.tsx
@@ -1,12 +1,3 @@
-import { createSignal, Show } from "solid-js";
-
-import bolt from "~/assets/icons/bolt.svg";
-import globe from "~/assets/icons/globe.svg";
-import privateEye from "~/assets/icons/private-eye.svg";
-import { Clock } from "~/assets/svg/Clock";
-import { Globe } from "~/assets/svg/Globe";
-import { PrivateEye } from "~/assets/svg/Private";
-import { LabelCircle } from "~/components";
 import { GenericItem } from "~/components/GenericItem";
 
 const PAUL =
@@ -85,7 +76,7 @@ export function Scratchpad() {
                 amount={420000n}
                 date={"Just now"}
                 accent="green"
-                public
+                visibility="public"
             />
             <GenericItem
                 primaryAvatarUrl={BEN}
@@ -97,7 +88,7 @@ export function Scratchpad() {
                 amount={420000n}
                 date={"Just now"}
                 accent="green"
-                public
+                visibility="public"
             />
             <GenericItem
                 primaryAvatarUrl={NETFLIX}
@@ -118,7 +109,7 @@ export function Scratchpad() {
                 amount={420000n}
                 date={"Just now"}
                 accent="green"
-                public
+                visibility="public"
             />
         </div>
     );
diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx
index 3846bde4..c2d51219 100644
--- a/src/routes/Send.tsx
+++ b/src/routes/Send.tsx
@@ -1,5 +1,5 @@
 import { MutinyInvoice, TagItem } from "@mutinywallet/mutiny-wasm";
-import { A, useLocation, useNavigate, useSearchParams } from "@solidjs/router";
+import { useLocation, useNavigate, useSearchParams } from "@solidjs/router";
 import {
     createEffect,
     createMemo,