diff --git a/plugins/RichPresence/src/ConfigEditor.tsx b/plugins/RichPresence/src/ConfigEditor.tsx
index 1fac69d..7fd77f4 100644
--- a/plugins/RichPresence/src/ConfigEditor.tsx
+++ b/plugins/RichPresence/src/ConfigEditor.tsx
@@ -24,15 +24,15 @@ export default function ConfigEditor({ selection }: { selection: string }) {
     const settings = useProxy(storage.selections[selection]) as Activity;
 
     return (
-        <ScrollView>
-            <FormSection title="Basic">
-                <FormInput
+        <ScrollView style={{ flex: 1 }} contentContainerStyle={{ paddingBottom: 38 }}>
+            <FormSection title="Basic" titleStyleType="no_border">
+                <FormInput required autoFocus
                     title="Application Name"
                     value={settings.name}
-                    placeholder="Vendetta"
+                    placeholder="Discord"
                     onChange={v => settings.name = v}
                 />
-                <FormInput
+                <FormInput required
                     title="Application ID"
                     value={settings.application_id}
                     placeholder="1054951789318909972"
@@ -100,7 +100,7 @@ export default function ConfigEditor({ selection }: { selection: string }) {
                     />}
                 />
                 <FormInput
-                    title="Start Timestamp (miliseconds)"
+                    title="Start Timestamp (milliseconds)"
                     value={settings.timestamps.start}
                     placeholder="1234567890"
                     disabled={!settings.timestamps._enabled}
@@ -108,7 +108,7 @@ export default function ConfigEditor({ selection }: { selection: string }) {
                     keyboardType="numeric"
                 />
                 <FormInput
-                    title="End Timestamp (miliseconds)"
+                    title="End Timestamp (milliseconds)"
                     value={settings.timestamps.end}
                     placeholder="1234567890"
                     disabled={!settings.timestamps._enabled}
@@ -122,10 +122,10 @@ export default function ConfigEditor({ selection }: { selection: string }) {
                     onPress={() => settings.timestamps.start = String(Date.now())}
                     trailing={FormRow.Arrow}
                 />
-                <FormText style={styles.subText}>
-                    Leaving start timestamp blank will use the time the Discord started.
-                </FormText>
             </FormSection>
+            <FormText style={styles.subText}>
+                Leaving start timestamp blank will use the time the Discord started.
+            </FormText>
             <FormSection title="Buttons">
                 <FormInput
                     title="First Button Text"
diff --git a/plugins/RichPresence/src/index.ts b/plugins/RichPresence/src/index.ts
index 9fe6eb2..01588a8 100644
--- a/plugins/RichPresence/src/index.ts
+++ b/plugins/RichPresence/src/index.ts
@@ -21,7 +21,7 @@ const storage = plugin.storage as typeof plugin.storage & {
     selections: Record<string, Activity>;
 };
 
-if (!storage.selected) {
+if (typeof storage.selected?.length !== "number") {
     Object.assign(storage, {
         selected: "default",
         selections: {
@@ -46,14 +46,13 @@ function createDefaultSelection(): Activity {
     };
 }
 
-async function sendRequest(activity: Activity | null): Promise<Activity> {
+async function sendRequest(activity: Activity | null): Promise<{ [K in keyof Activity]: any } & Record<string, any>> {
     if (typeof activity !== "object") throw new Error("Invalid activity");
 
     const timestampEnabled = activity?.timestamps?._enabled;
     activity = cloneAndFilter(activity);
 
     if (timestampEnabled) {
-        delete activity.timestamps._enabled;
         activity.timestamps.start ||= pluginStartSince;
     } else {
         delete activity.timestamps;
@@ -67,15 +66,19 @@ async function sendRequest(activity: Activity | null): Promise<Activity> {
 
     if (activity?.buttons?.length) {
         activity.buttons = activity.buttons.filter(x => x.label && x.url);
-        activity.buttons.length && Object.assign(activity, {
-            metadata: { button_urls: activity.buttons.map(x => x.url) },
-            buttons: activity.buttons.map(x => x.label)
-        });
+        activity.buttons.length
+            ? Object.assign(activity, {
+                metadata: { button_urls: activity.buttons.map(x => x.url) },
+                buttons: activity.buttons.map(x => x.label)
+            })
+            : delete activity.buttons;
     }
 
     FluxDispatcher.dispatch({
         type: "LOCAL_ACTIVITY_UPDATE",
-        activity: activity
+        activity: activity,
+        pid: 1608,
+        socketId: "RichPresence@Vendetta"
     });
 
     return activity;
@@ -86,10 +89,18 @@ export default new class RichPresence {
         logger.log("Sending RPC request");
 
         const currentActivity = storage.selections[storage.selected];
-        sendRequest(currentActivity).catch().then(x => {
-            logger.log("RPC request sent");
-            console.log(x);
-        });
+        if (!currentActivity) {
+            throw new Error("Selected activity does not exist");
+        }
+
+        sendRequest(currentActivity)
+            .then(x => {
+                logger.log("RPC request sent");
+                logger.log(x);
+            }).catch(e => {
+                logger.error("An error occured while sending RPC request :(");
+                logger.error(e?.stack ?? e);
+            });
     }
 
     onUnload() {