diff --git a/Assets/DefaultAppIcon.png b/Assets/DefaultAppIcon.png
new file mode 100644
index 0000000..a9c19ee
Binary files /dev/null and b/Assets/DefaultAppIcon.png differ
diff --git a/Assets/DefaultTitleIcon.png b/Assets/DefaultTitleIcon.png
new file mode 100644
index 0000000..089293a
Binary files /dev/null and b/Assets/DefaultTitleIcon.png differ
diff --git a/Orbis Suite 3.0.sln b/Orbis Suite 3.0.sln
index 3d6ff65..1f49695 100644
--- a/Orbis Suite 3.0.sln	
+++ b/Orbis Suite 3.0.sln	
@@ -13,16 +13,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{DBCE3AAD-3
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrbisNeighborHood", "Windows\OrbisNeighborHood\OrbisNeighborHood.csproj", "{81B068F7-776C-429F-BB7B-5563F75F1A39}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{6046C772-BE17-4BC8-A362-AD8C77F9178E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Debug|x86.Build.0 = Debug|Any CPU
 		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Release|x86.ActiveCfg = Release|Any CPU
+		{81B068F7-776C-429F-BB7B-5563F75F1A39}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -30,6 +38,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{72E29C1E-8723-4885-A5ED-BD3A929D81B6} = {8F0E1457-FB1E-47A4-9DA8-74A6B757CAA4}
 		{81B068F7-776C-429F-BB7B-5563F75F1A39} = {8F0E1457-FB1E-47A4-9DA8-74A6B757CAA4}
+		{6046C772-BE17-4BC8-A362-AD8C77F9178E} = {8F0E1457-FB1E-47A4-9DA8-74A6B757CAA4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B6EE1D0-5ADF-44A2-B6EE-E5C8E110EE47}
diff --git a/Windows/OrbisNeighborHood/App.xaml b/Windows/OrbisNeighborHood/App.xaml
index cf6c412..f5ab62d 100644
--- a/Windows/OrbisNeighborHood/App.xaml
+++ b/Windows/OrbisNeighborHood/App.xaml
@@ -15,8 +15,6 @@
 
                 <!-- Custom Themes -->
                 <ResourceDictionary Source="Theme/MenuButtonTheme.xaml"/>
-
-                <ResourceDictionary Source="/OrbisNeighborHood;component/Controls/SettingPanel.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             
             <!-- View Models -->
diff --git a/Windows/OrbisNeighborHood/Controls/NewTargetView.xaml b/Windows/OrbisNeighborHood/Controls/NewTargetView.xaml
index 18dd1d9..d6d446e 100644
--- a/Windows/OrbisNeighborHood/Controls/NewTargetView.xaml
+++ b/Windows/OrbisNeighborHood/Controls/NewTargetView.xaml
@@ -16,7 +16,9 @@
             <Image 
                Width="70"
                Height="70"
-               Source="/OrbisNeighborHood;component/Images/Plus.png"/>
+               Source="/OrbisNeighborHood;component/Images/Plus.png"
+               RenderOptions.BitmapScalingMode="Fant"
+               RenderOptions.EdgeMode="Aliased"/>
 
             <TextBlock Text="Add Target"
                        Foreground="{DynamicResource Text}"
diff --git a/Windows/OrbisNeighborHood/Controls/SettingPanel.xaml b/Windows/OrbisNeighborHood/Controls/SettingPanel.xaml
index 0c1bc5b..c22e6fb 100644
--- a/Windows/OrbisNeighborHood/Controls/SettingPanel.xaml
+++ b/Windows/OrbisNeighborHood/Controls/SettingPanel.xaml
@@ -1,9 +1,15 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:OrbisNeighborHood.Controls">
+<ContentControl x:Class="OrbisNeighborHood.Controls.SettingPanel"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OrbisNeighborHood.Controls"
+             xmlns:simpleControls="clr-namespace:SimpleUI.Controls;assembly=SimpleUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="60" d:DesignWidth="295">
 
-    <Style TargetType="{x:Type local:SettingPanel}">
-        <Style.Setters>
+    <ContentControl.Resources>
+        <Style TargetType="{x:Type local:SettingPanel}">
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type local:SettingPanel}">
@@ -26,16 +32,17 @@
                             </StackPanel>
 
                             <Grid Grid.Column="1">
-                                <!--<ContentControl HorizontalAlignment="Right"
-                                            VerticalAlignment="Stretch"
-                                            Content="{TemplateBinding Content}"/>-->
 
+                                <AdornerDecorator>
+                                    <ContentPresenter HorizontalAlignment="Right"
+                                  VerticalAlignment="Stretch"
+                                  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}"/>
+                                </AdornerDecorator>
                             </Grid>
                         </Grid>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
-        </Style.Setters>
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
+        </Style>
+    </ContentControl.Resources>
+</ContentControl>
\ No newline at end of file
diff --git a/Windows/OrbisNeighborHood/Controls/SettingPanel.cs b/Windows/OrbisNeighborHood/Controls/SettingPanel.xaml.cs
similarity index 82%
rename from Windows/OrbisNeighborHood/Controls/SettingPanel.cs
rename to Windows/OrbisNeighborHood/Controls/SettingPanel.xaml.cs
index 5392a81..93bab7a 100644
--- a/Windows/OrbisNeighborHood/Controls/SettingPanel.cs
+++ b/Windows/OrbisNeighborHood/Controls/SettingPanel.xaml.cs
@@ -5,6 +5,13 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 
 namespace OrbisNeighborHood.Controls
 {
@@ -13,6 +20,11 @@ namespace OrbisNeighborHood.Controls
     /// </summary>
     public partial class SettingPanel : ContentControl
     {
+        public SettingPanel()
+        {
+            InitializeComponent();
+        }
+
         public string? SettingName { get; set; } = string.Empty;
 
         public static readonly DependencyProperty SettingNameProperty =
diff --git a/Windows/OrbisNeighborHood/Controls/TargetView.xaml b/Windows/OrbisNeighborHood/Controls/TargetView.xaml
index 3a5713f..aa819d6 100644
--- a/Windows/OrbisNeighborHood/Controls/TargetView.xaml
+++ b/Windows/OrbisNeighborHood/Controls/TargetView.xaml
@@ -57,7 +57,9 @@
                     <Rectangle Fill="#45494A"/>
 
                     <Image Name="ConsoleImageElement"
-                           Source="/OrbisNeighborHood;component/Images/Consoles/Fat.png"/>
+                           Source="/OrbisNeighborHood;component/Images/Consoles/Fat.png"
+                           RenderOptions.BitmapScalingMode="Fant"
+                           RenderOptions.EdgeMode="Aliased"/>
                 </Grid>
                 
 
diff --git a/Windows/OrbisNeighborHood/Images/DefaultAppIcon.png b/Windows/OrbisNeighborHood/Images/DefaultAppIcon.png
new file mode 100644
index 0000000..a9c19ee
Binary files /dev/null and b/Windows/OrbisNeighborHood/Images/DefaultAppIcon.png differ
diff --git a/Windows/OrbisNeighborHood/Images/DefaultTitleIcon.png b/Windows/OrbisNeighborHood/Images/DefaultTitleIcon.png
new file mode 100644
index 0000000..089293a
Binary files /dev/null and b/Windows/OrbisNeighborHood/Images/DefaultTitleIcon.png differ
diff --git a/Windows/OrbisNeighborHood/MVVM/View/DashboardView.xaml b/Windows/OrbisNeighborHood/MVVM/View/DashboardView.xaml
index 69fd74e..901103d 100644
--- a/Windows/OrbisNeighborHood/MVVM/View/DashboardView.xaml
+++ b/Windows/OrbisNeighborHood/MVVM/View/DashboardView.xaml
@@ -33,7 +33,7 @@
 
                         <!-- Target State -->
                         <Ellipse Grid.ColumnSpan="2" Grid.Row="0"
-                         Fill="Green"
+                         Fill="Red"
                          Width="14"
                          Height="14"
                          HorizontalAlignment="Left"
@@ -153,7 +153,9 @@
                                 BorderThickness="1"
                                 BorderBrush="#333333"
                                 Margin="8">
-                            <Image Source="https://image.api.playstation.com/gs2-sec/appkgo/prod/CUSA08519_00/12/i_3da1cf7c41dc7652f9b639e1680d96436773658668c7dc3930c441291095713b/i/icon0.png"/>
+                            <Image Source="/OrbisNeighborHood;component/Images/DefaultTitleIcon.png"
+                                   RenderOptions.BitmapScalingMode="Fant"
+                                   RenderOptions.EdgeMode="Aliased"/>
                         </Border>
 
                         <StackPanel Grid.Column="1" Grid.Row="1"
@@ -162,19 +164,19 @@
 
                             <TextBlock HorizontalAlignment="Left"
                                        Margin="5 0 0 0"
-                                       Text="Red Dead Redemption 2"
+                                       Text="Unkown Title"
                                        Foreground="{DynamicResource Text}"
                                        FontSize="14"/>
 
                             <TextBlock HorizontalAlignment="Left"
                                        Margin="5 0 0 0"
-                                       Text="CUSA08519_00"
+                                       Text="-"
                                        Foreground="{DynamicResource Text}"
                                        FontSize="14"/>
 
                             <TextBlock HorizontalAlignment="Left"
                                        Margin="5 0 0 0"
-                                       Text="eboot.bin (79)"
+                                       Text="-"
                                        Foreground="{DynamicResource Text}"
                                        FontSize="14"/>
 
@@ -292,19 +294,19 @@
                                                                 Width="125" Height="125"
                                                                 Thickness="18"
                                                                 FontSize="18"
-                                                                ProgressPercentage="85"/>
+                                                                ProgressPercentage="0"/>
                         <!-- Info Fields -->
                         <StackPanel Margin="3 5 0 0" Orientation="Vertical">
                             <StackPanel Orientation="Horizontal">
                                 
                                 <simpleControls:SimpleTextField FieldName="CPU Temp" 
-                                                        FieldText="71 °C"
+                                                        FieldText="- °C"
                                                         Width="73.5"
                                                         Height="35"
                                                         Margin="0 0 10 0"/>
                                 
                                 <simpleControls:SimpleTextField FieldName="SOC Temp" 
-                                                        FieldText="68 °C"
+                                                        FieldText="- °C"
                                                         Width="73.5"
                                                         Height="35"/>
                             </StackPanel>
@@ -312,13 +314,13 @@
                             <StackPanel Margin="0 5 0 0" Orientation="Horizontal">
 
                                 <simpleControls:SimpleTextField FieldName="Thread Count" 
-                                                        FieldText="736"
+                                                        FieldText="-"
                                                         Width="73.5"
                                                         Height="35"
                                                         Margin="0 0 10 0"/>
 
                                 <simpleControls:SimpleTextField FieldName="Top Core" 
-                                                        FieldText="4"
+                                                        FieldText="-"
                                                         Width="73.5"
                                                         Height="35"/>
                             </StackPanel>
@@ -326,13 +328,13 @@
                             <StackPanel Margin="0 5 0 0" Orientation="Horizontal">
 
                                 <simpleControls:SimpleTextField FieldName="Ram Usage" 
-                                                        FieldText="2479 MB"
+                                                        FieldText="- MB"
                                                         Width="73.5"
                                                         Height="35"
                                                         Margin="0 0 10 0"/>
 
                                 <simpleControls:SimpleTextField FieldName="V-Ram Usage" 
-                                                        FieldText="615 MB"
+                                                        FieldText="- MB"
                                                         Width="73.5"
                                                         Height="35"/>
                             </StackPanel>
@@ -389,7 +391,7 @@
 
                 </Border>
 
-                <!-- Module Manager -->
+                <!-- Library Manager -->
                 <Border Grid.Column="3"
                         Width="116"
                         Height="116"
@@ -399,7 +401,7 @@
                     <StackPanel>
                         <Image Margin="30 20 30 0" Source="/OrbisNeighborHood;component/Images/Icons/OrbisModuleManager.ico"/>
 
-                        <TextBlock Text="Module Manager"
+                        <TextBlock Text="Library Manager"
                                    FontSize="13"
                                    Margin="0 10 0 0"
                                    Foreground="{DynamicResource Text}"
diff --git a/Windows/OrbisNeighborHood/MVVM/View/SettingsView.xaml b/Windows/OrbisNeighborHood/MVVM/View/SettingsView.xaml
index 4934567..0731c94 100644
--- a/Windows/OrbisNeighborHood/MVVM/View/SettingsView.xaml
+++ b/Windows/OrbisNeighborHood/MVVM/View/SettingsView.xaml
@@ -35,7 +35,7 @@
                     <controls:SettingPanel SettingName="API Port"
                                            SettingDescription="The port used to communicate with target machines using the Orbislib API."
                                            Margin="0 0 0 15">
-                        <TextBox 
+                        <TextBox Tag="APIPort"
                                  Text="9020"
                                  Width="50"
                                  Height="18"
@@ -59,7 +59,7 @@
                     <controls:SettingPanel SettingName="FTP Port"
                                            SettingDescription="The port that will be used to access the targets file system using ftp."
                                            Margin="0 0 0 15">
-                        <TextBox Name="FTPPort"
+                        <TextBox Tag="FTPPort"
                                  Text="1212"
                                  Width="50"
                                  Height="18"
@@ -83,7 +83,7 @@
                     <controls:SettingPanel SettingName="Klog Port"
                                            SettingDescription="The port of a klog server that will be used to print console output similar to UART."
                                            Margin="0 0 0 15">
-                        <TextBox 
+                        <TextBox Tag="KlogPort"
                                  Text="3232"
                                  Width="50"
                                  Height="18"
@@ -107,7 +107,7 @@
                     <controls:SettingPanel SettingName="Serial Com Port"
                                            SettingDescription="The USB serial com port name used to connect to the Targets UART."
                                            Margin="0 0 0 15">
-                        <TextBox 
+                        <TextBox Tag="COMPort"
                                  Text="com3"
                                  Width="50"
                                  Height="18"
@@ -131,7 +131,7 @@
                     <controls:SettingPanel SettingName="Start Taskbar App on Boot"
                                            SettingDescription="Have the Orbis Suite Taskbar App to start when windows starts."
                                            Margin="0 0 0 15">
-                        <simpleControls:SimpleSwitch Height="15"/>
+                        <simpleControls:SimpleSwitch Tag="OnStart" Height="15"/>
                     </controls:SettingPanel>
 
                 </StackPanel>
diff --git a/Windows/OrbisNeighborHood/NeighborHood.xaml b/Windows/OrbisNeighborHood/NeighborHood.xaml
index db7d551..7de5653 100644
--- a/Windows/OrbisNeighborHood/NeighborHood.xaml
+++ b/Windows/OrbisNeighborHood/NeighborHood.xaml
@@ -9,7 +9,8 @@
         mc:Ignorable="d"
         Title="NeighborHood" Height="640" Width="960"
         MinHeight="640" MinWidth="960"
-        MaxHeight="640" MaxWidth="960">
+        MaxHeight="640" MaxWidth="960"
+        UseLayoutRounding="True">
 
     <Window.DataContext>
         <viewModel:MainViewModel/>
@@ -47,7 +48,9 @@
                     BorderThickness="1"
                     BorderBrush="#333333"
                     Margin="8">
-                <Image Source="https://image.api.playstation.com/gs2-sec/appkgo/prod/CUSA08519_00/12/i_3da1cf7c41dc7652f9b639e1680d96436773658668c7dc3930c441291095713b/i/icon0.png"/>
+                <Image Source="/OrbisNeighborHood;component/Images/DefaultTitleIcon.png"
+                       RenderOptions.BitmapScalingMode="Fant"
+                       RenderOptions.EdgeMode="Aliased"/>
             </Border>
 
             <StackPanel Grid.Column="1" Grid.Row="1"
@@ -60,7 +63,7 @@
 
                     <!-- Target State -->
                     <Ellipse Grid.ColumnSpan="2" Grid.Row="0"
-                     Fill="Green"
+                     Fill="Red"
                      Width="12"
                      Height="12"
                      HorizontalAlignment="Left"
@@ -81,13 +84,13 @@
 
                 <TextBlock HorizontalAlignment="Left"
                            Margin="5 0 0 0"
-                           Text="Red Dead Redemption 2"
+                           Text="Unknown Title"
                            Foreground="{DynamicResource Text}"
                            FontSize="10"/>
 
                 <TextBlock HorizontalAlignment="Left"
                            Margin="5 0 0 0"
-                           Text="CUSA08519_00"
+                           Text="-"
                            Foreground="{DynamicResource Text}"
                            FontSize="10"/>
 
diff --git a/Windows/OrbisNeighborHood/OrbisNeighborHood.csproj b/Windows/OrbisNeighborHood/OrbisNeighborHood.csproj
index a11688e..04d941d 100644
--- a/Windows/OrbisNeighborHood/OrbisNeighborHood.csproj
+++ b/Windows/OrbisNeighborHood/OrbisNeighborHood.csproj
@@ -13,6 +13,8 @@
     <None Remove="Images\Consoles\Pro.png" />
     <None Remove="Images\Consoles\Slim.png" />
     <None Remove="Images\Default.ico" />
+    <None Remove="Images\DefaultAppIcon.png" />
+    <None Remove="Images\DefaultTitleIcon.png" />
     <None Remove="Images\Icons\OrbisConsoleOutput.ico" />
     <None Remove="Images\Icons\OrbisDebugger.ico" />
     <None Remove="Images\Icons\OrbisModuleManager.ico" />
@@ -55,6 +57,12 @@
     <Resource Include="Images\Default.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\DefaultAppIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\DefaultTitleIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\Icons\OrbisConsoleOutput.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>