diff --git a/LANCommander/Pages/Settings/General.razor b/LANCommander/Pages/Settings/General.razor
index a4239b8..c125681 100644
--- a/LANCommander/Pages/Settings/General.razor
+++ b/LANCommander/Pages/Settings/General.razor
@@ -8,17 +8,26 @@
 <PageHeader Title="General" />
 
 <div style="padding: 0 24px;">
-    <Text>IGDB Credentials</Text>
-    <Text>In order to use IGDB metadata, you need a Twitch developer account. <a href="https://api-docs.igdb.com/#account-creation" target="_blank">Click here</a> for more details.</Text>
     <Form Model="Settings" Layout="@FormLayout.Vertical">
+        <FormItem Label="Beacon">
+            <Switch @bind-Checked="context.Beacon" />
+        </FormItem>
+
+        <Text Type="@TextElementType.Secondary">Enabling the beacon will allow clients on the same network to auto-discover the LANCommander address.</Text>
+
+        <Divider Text="IGDB Credentials" />
+
+        <Text Type="@TextElementType.Secondary">In order to use IGDB metadata, you need a Twitch developer account. <a href="https://api-docs.igdb.com/#account-creation" target="_blank">Click here</a> for more details.</Text>
+
         <FormItem Label="Client ID">
             <Input @bind-Value="context.IGDBClientId" />
         </FormItem>
         <FormItem Label="Client Secret">
             <InputPassword @bind-Value="context.IGDBClientSecret" />
         </FormItem>
+
         <FormItem>
-            <Button OnClick="Save" Icon="@IconType.Fill.Save">Save</Button>
+            <Button OnClick="Save" Type="@ButtonType.Primary">Save</Button>
         </FormItem>
     </Form>
 </div>