diff --git a/apps/staking/src/components/AccountSummary/index.tsx b/apps/staking/src/components/AccountSummary/index.tsx
index 17cf01bf47..0e4a3b1c89 100644
--- a/apps/staking/src/components/AccountSummary/index.tsx
+++ b/apps/staking/src/components/AccountSummary/index.tsx
@@ -115,11 +115,32 @@ export const AccountSummary = ({
             transfer={api.deposit}
             enableWithZeroMax
           />
-          <WithdrawButton
-            api={api}
-            max={availableToWithdraw}
-            className="xl:hidden"
-          />
+          {availableToWithdraw === 0n ? (
+            <DialogTrigger>
+              <Button variant="secondary" className="xl:hidden">
+                Withdraw
+              </Button>
+              <ModalDialog title="No Withdrawable Tokens" closeButtonText="Ok">
+                <p className="mb-8 font-semibold">
+                  You have no tokens available for withdrawal
+                </p>
+
+                <div className="-mb-4 flex max-w-96 flex-row gap-2 border border-neutral-600/50 bg-pythpurple-400/20 p-4">
+                  <InformationCircleIcon className="size-8 flex-none" />
+                  <div className="text-sm">
+                    You can only withdraw tokens that are unlocked and not
+                    staked in either OIS or Pyth Governance
+                  </div>
+                </div>
+              </ModalDialog>
+            </DialogTrigger>
+          ) : (
+            <WithdrawButton
+              api={api}
+              max={availableToWithdraw}
+              className="xl:hidden"
+            />
+          )}
           {api.type === ApiStateType.Loaded ? (
             <DialogTrigger>
               <Button variant="secondary" className="xl:hidden">
diff --git a/apps/staking/src/components/Dashboard/index.tsx b/apps/staking/src/components/Dashboard/index.tsx
index 8b93da52d6..3d61e13068 100644
--- a/apps/staking/src/components/Dashboard/index.tsx
+++ b/apps/staking/src/components/Dashboard/index.tsx
@@ -126,7 +126,7 @@ export const Dashboard = ({
   }, [tab]);
 
   return (
-    <main className="flex w-full flex-col gap-8 xl:mx-4 xl:my-6">
+    <main className="flex w-full flex-col gap-8 xl:px-4 xl:py-6">
       <AccountSummary
         api={api}
         locked={locked}
@@ -141,7 +141,7 @@ export const Dashboard = ({
       <Tabs
         selectedKey={tab}
         onSelectionChange={setTab}
-        className="group border-neutral-600/50 data-[empty]:mb-20 data-[empty]:mt-6 data-[empty]:border data-[empty]:bg-white/10 data-[empty]:p-4 data-[empty]:md:border-0 data-[empty]:md:bg-transparent data-[empty]:md:p-0"
+        className="group border-neutral-600/50 data-[empty]:mb-20 data-[empty]:mt-6 data-[empty]:border data-[empty]:bg-white/10 data-[empty]:p-4 sm:p-4 data-[empty]:md:border-0 data-[empty]:md:bg-transparent data-[empty]:md:p-0"
         {...(tab === TabIds.Empty && { "data-empty": true })}
       >
         <h1 className="my-4 hidden text-center text-3xl/tight font-light group-data-[empty]:block md:mb-14 md:mt-8 md:text-5xl">
diff --git a/apps/staking/src/components/Header/help-menu.tsx b/apps/staking/src/components/Header/help-menu.tsx
index 50ab4cdabe..0334fd5d6e 100644
--- a/apps/staking/src/components/Header/help-menu.tsx
+++ b/apps/staking/src/components/Header/help-menu.tsx
@@ -58,6 +58,12 @@ export const HelpMenu = () => {
           <Separator />
           <Section>
             <MenuItem onAction={openPublisherFaq}>Data Publisher FAQ</MenuItem>
+            <MenuItem
+              href="https://pyth-network.notion.site/Oracle-Integrity-Staking-OIS-Guide-for-Pyth-Network-MDPs-2755c872a7c44aefabfa9987ba7ec8ae"
+              target="_blank"
+            >
+              Data Publisher Guide
+            </MenuItem>
           </Section>
         </Menu>
       </MenuTrigger>
diff --git a/apps/staking/src/components/Menu/index.tsx b/apps/staking/src/components/Menu/index.tsx
index 60cc49c16f..9c71f11b99 100644
--- a/apps/staking/src/components/Menu/index.tsx
+++ b/apps/staking/src/components/Menu/index.tsx
@@ -23,12 +23,12 @@ export const Menu = <T extends object>({
   ...props
 }: MenuProps<T>) => (
   <Popover
-    className="data-[entering]:animate-in data-[exiting]:animate-out data-[entering]:fade-in data-[exiting]:fade-out focus:outline-none focus:ring-0 focus-visible:outline-none focus-visible:ring-0"
+    className="data-[entering]:animate-in data-[exiting]:animate-out data-[entering]:fade-in data-[exiting]:fade-out"
     {...(placement && { placement })}
   >
     <BaseMenu
       className={clsx(
-        "flex origin-top-right flex-col border border-neutral-400 bg-pythpurple-100 py-2 text-sm text-pythpurple-950 shadow shadow-neutral-400 focus:outline-none focus:ring-0 focus-visible:outline-none focus-visible:ring-0",
+        "flex origin-top-right flex-col border border-neutral-400 bg-pythpurple-100 py-2 text-sm text-pythpurple-950 shadow shadow-neutral-400 outline-none",
         className,
       )}
       {...props}
diff --git a/apps/staking/src/components/OracleIntegrityStaking/index.tsx b/apps/staking/src/components/OracleIntegrityStaking/index.tsx
index 6c555e3d6d..ca88365867 100644
--- a/apps/staking/src/components/OracleIntegrityStaking/index.tsx
+++ b/apps/staking/src/components/OracleIntegrityStaking/index.tsx
@@ -34,7 +34,7 @@ import {
   StateType as UseAsyncStateType,
   useAsync,
 } from "../../hooks/use-async";
-import { Button } from "../Button";
+import { Button, LinkButton } from "../Button";
 import { CopyButton } from "../CopyButton";
 import { ModalDialog } from "../ModalDialog";
 import { OracleIntegrityStakingGuide } from "../OracleIntegrityStakingGuide";
@@ -120,6 +120,13 @@ export const OracleIntegrityStaking = ({
                 You - <PublisherName fullKey>{self}</PublisherName>
               </h3>
               <div className="flex flex-row items-center gap-4">
+                <LinkButton
+                  href="https://pyth-network.notion.site/Oracle-Integrity-Staking-OIS-Guide-for-Pyth-Network-MDPs-2755c872a7c44aefabfa9987ba7ec8ae"
+                  target="_blank"
+                  size="small"
+                >
+                  Publisher Guide
+                </LinkButton>
                 <DialogTrigger>
                   <Button size="small">Publisher FAQ</Button>
                   <PublisherFaq />
diff --git a/apps/staking/src/components/WalletButton/index.tsx b/apps/staking/src/components/WalletButton/index.tsx
index 6aa7e3340e..594d3871d1 100644
--- a/apps/staking/src/components/WalletButton/index.tsx
+++ b/apps/staking/src/components/WalletButton/index.tsx
@@ -5,7 +5,6 @@ import {
   ArrowsRightLeftIcon,
   XCircleIcon,
   ChevronDownIcon,
-  TableCellsIcon,
   BanknotesIcon,
   ChevronRightIcon,
   CheckIcon,
@@ -19,7 +18,6 @@ import {
   type ComponentProps,
   type ReactNode,
   useCallback,
-  useState,
   useMemo,
   type ReactElement,
 } from "react";
@@ -42,10 +40,8 @@ import {
 import { StateType as DataStateType, useData } from "../../hooks/use-data";
 import { useLogger } from "../../hooks/use-logger";
 import { usePrimaryDomain } from "../../hooks/use-primary-domain";
-import { AccountHistory } from "../AccountHistory";
 import { Button } from "../Button";
 import { Menu, MenuItem, Section, Separator } from "../Menu";
-import { ModalDialog } from "../ModalDialog";
 import { TruncatedKey } from "../TruncatedKey";
 
 const ONE_SECOND_IN_MS = 1000;
@@ -103,10 +99,6 @@ const ConnectedButton = ({
   api,
   ...props
 }: ConnectedButtonProps) => {
-  const [accountHistoryOpen, setAccountHistoryOpen] = useState(false);
-  const openAccountHistory = useCallback(() => {
-    setAccountHistoryOpen(true);
-  }, [setAccountHistoryOpen]);
   const modal = useWalletModal();
   const showModal = useCallback(() => {
     modal.setVisible(true);
@@ -120,61 +112,39 @@ const ConnectedButton = ({
   }, [wallet, logger]);
 
   return (
-    <>
-      <MenuTrigger>
-        <ButtonComponent
-          className={clsx(
-            "group data-[pressed]:bg-pythpurple-600/60",
-            className,
-          )}
-          {...props}
-        >
-          <span className="truncate">
-            <ButtonContent />
-          </span>
-          <ChevronDownIcon className="size-4 flex-none opacity-60 transition duration-300 group-data-[pressed]:-rotate-180" />
-        </ButtonComponent>
-        <Menu className="min-w-[var(--trigger-width)]">
-          {api.type === ApiStateType.Loaded && (
-            <>
-              <Section>
-                <StakeAccountSelector api={api}>
-                  <MenuItem
-                    icon={BanknotesIcon}
-                    textValue="Select stake account"
-                  >
-                    <span>Select stake account</span>
-                    <ChevronRightIcon className="size-4" />
-                  </MenuItem>
-                </StakeAccountSelector>
-                <MenuItem onAction={openAccountHistory} icon={TableCellsIcon}>
-                  Account history
+    <MenuTrigger>
+      <ButtonComponent
+        className={clsx("group data-[pressed]:bg-pythpurple-600/60", className)}
+        {...props}
+      >
+        <span className="truncate">
+          <ButtonContent />
+        </span>
+        <ChevronDownIcon className="size-4 flex-none opacity-60 transition duration-300 group-data-[pressed]:-rotate-180" />
+      </ButtonComponent>
+      <Menu className="min-w-[var(--trigger-width)]">
+        {api.type === ApiStateType.Loaded && (
+          <>
+            <Section>
+              <StakeAccountSelector api={api}>
+                <MenuItem icon={BanknotesIcon} textValue="Select stake account">
+                  <span>Select stake account</span>
+                  <ChevronRightIcon className="size-4" />
                 </MenuItem>
-              </Section>
-              <Separator />
-            </>
-          )}
-          <Section>
-            <MenuItem onAction={showModal} icon={ArrowsRightLeftIcon}>
-              Change wallet
-            </MenuItem>
-            <MenuItem onAction={disconnectWallet} icon={XCircleIcon}>
-              Disconnect
-            </MenuItem>
-          </Section>
-        </Menu>
-      </MenuTrigger>
-      {api.type === ApiStateType.Loaded && (
-        <ModalDialog
-          isOpen={accountHistoryOpen}
-          onOpenChange={setAccountHistoryOpen}
-          title="Account history"
-          description="A history of events that have affected your account balances"
-        >
-          <AccountHistory api={api} />
-        </ModalDialog>
-      )}
-    </>
+              </StakeAccountSelector>
+            </Section>
+          </>
+        )}
+        <Section>
+          <MenuItem onAction={showModal} icon={ArrowsRightLeftIcon}>
+            Change wallet
+          </MenuItem>
+          <MenuItem onAction={disconnectWallet} icon={XCircleIcon}>
+            Disconnect
+          </MenuItem>
+        </Section>
+      </Menu>
+    </MenuTrigger>
   );
 };
 
@@ -206,47 +176,47 @@ const StakeAccountSelector = ({ children, api }: StakeAccountSelectorProps) => {
     }
   }, [data, api]);
 
-  if (accounts === undefined) {
+  return accounts === undefined ||
     // eslint-disable-next-line unicorn/no-null
-    return null;
-  } else if (accounts.main === undefined) {
-    return accounts.other.length > 1 ? (
-      <SubmenuTrigger>
-        {children}
-        <Menu items={accounts.other} className="-mr-20 xs:mr-0">
-          {({ account }) => <AccountMenuItem account={account} api={api} />}
-        </Menu>
-      </SubmenuTrigger>
-    ) : // eslint-disable-next-line unicorn/no-null
-    null;
-  } else {
-    return (
-      <SubmenuTrigger>
-        {children}
-        <Menu className="-mr-20 xs:mr-0">
-          <Section>
-            <Header className="mx-4 text-sm font-semibold">Main Account</Header>
-            <AccountMenuItem account={accounts.main} api={api} />
-          </Section>
-          {accounts.other.length > 0 && (
-            <>
-              <Separator />
-              <Section>
-                <Header className="mx-4 text-sm font-semibold">
-                  Other Accounts
-                </Header>
-                <Collection items={accounts.other}>
-                  {({ account }) => (
-                    <AccountMenuItem account={account} api={api} />
-                  )}
-                </Collection>
-              </Section>
-            </>
-          )}
-        </Menu>
-      </SubmenuTrigger>
-    );
-  }
+    (accounts.main === undefined && accounts.other.length === 1) ? null : (
+    <>
+      <Section>
+        <SubmenuTrigger>
+          {children}
+          <Menu items={accounts.other} className="-mr-20 xs:mr-0">
+            {accounts.main === undefined ? (
+              ({ account }) => <AccountMenuItem account={account} api={api} />
+            ) : (
+              <>
+                <Section>
+                  <Header className="mx-4 text-sm font-semibold">
+                    Main Account
+                  </Header>
+                  <AccountMenuItem account={accounts.main} api={api} />
+                </Section>
+                {accounts.other.length > 0 && (
+                  <>
+                    <Separator />
+                    <Section>
+                      <Header className="mx-4 text-sm font-semibold">
+                        Other Accounts
+                      </Header>
+                      <Collection items={accounts.other}>
+                        {({ account }) => (
+                          <AccountMenuItem account={account} api={api} />
+                        )}
+                      </Collection>
+                    </Section>
+                  </>
+                )}
+              </>
+            )}
+          </Menu>
+        </SubmenuTrigger>
+      </Section>
+      <Separator />
+    </>
+  );
 };
 
 type AccountMenuItemProps = {