diff --git a/ADIS_Csharp/RobotClientWpf/MainWindow.xaml b/ADIS_Csharp/RobotClientWpf/MainWindow.xaml
index e2a3025..f301bf1 100644
--- a/ADIS_Csharp/RobotClientWpf/MainWindow.xaml
+++ b/ADIS_Csharp/RobotClientWpf/MainWindow.xaml
@@ -5,17 +5,19 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:RobotClientWpf"
         xmlns:views="clr-namespace:RobotClientWpf.Views"
+        xmlns:dj="clr-namespace:DJ;assembly=NLogViewer"
         mc:Ignorable="d" FontSize="15"
         Title="Challenge UI" Height="700" Width="1200" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="150"/>
             <RowDefinition Height="30"/>
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="5">
-            <Label HorizontalAlignment="Center">MQTT Broker IP: </Label>
+            <Label HorizontalAlignment="Center">MQTT Broker IP:</Label>
             <TextBox x:Name="tbIp" Width="120" Height="25" FontSize="15" TextAlignment="Left" Margin="10 0 0 0">192.168.156.156</TextBox>
             <Button x:Name="btnConnectDisconnect" Content="Connect" Width="100" Margin="20 0 0 0" Click="btnConnectDisconnect_Click"></Button>
         </StackPanel>
@@ -46,7 +48,31 @@
             </TabItem>
         </TabControl>
 
-        <StackPanel Grid.Row="2" Orientation="Horizontal">
+        <dj:NLogViewer Grid.Row="2" Margin="10 0 10 0" DebugForeground="Black" MaxCount="150" ErrorForeground="Black" FatalForeground="Black" TraceForeground="Black" InfoForeground="Black" WarnForeground="Black">
+            <dj:NLogViewer.WarnBackground>
+                <SolidColorBrush Color="#FFFF9D00" Opacity="0.5"/>
+            </dj:NLogViewer.WarnBackground>
+            <dj:NLogViewer.TraceBackground>
+                <SolidColorBrush Color="#FF9B9B9B" Opacity="0.5"/>
+            </dj:NLogViewer.TraceBackground>
+            <dj:NLogViewer.InfoBackground>
+                <SolidColorBrush Color="#FF9B9B9B" Opacity="0.5"/>
+            </dj:NLogViewer.InfoBackground>
+            <dj:NLogViewer.DebugBackground>
+                <SolidColorBrush Color="#FF003DC3" Opacity="0.5"/>
+            </dj:NLogViewer.DebugBackground>
+            <dj:NLogViewer.ErrorBackground>
+                <SolidColorBrush Color="#FFFF2E00" Opacity="0.5"/>
+            </dj:NLogViewer.ErrorBackground>
+            <dj:NLogViewer.FatalBackground>
+                <SolidColorBrush Color="Red" Opacity="0.5"/>
+            </dj:NLogViewer.FatalBackground>
+        </dj:NLogViewer>
+        <!--<RichTextBox x:Name="rtbLogs" Grid.Row="2" Margin="10 0 10 0" IsReadOnly="True">
+            
+        </RichTextBox>-->
+
+        <StackPanel Grid.Row="3" Orientation="Horizontal">
             <TextBlock x:Name="tbBottomMessage" FontSize="15" Margin="10 5"/>
         </StackPanel>
     </Grid>
diff --git a/ADIS_Csharp/RobotClientWpf/MainWindow.xaml.cs b/ADIS_Csharp/RobotClientWpf/MainWindow.xaml.cs
index 231c149..d5d2221 100644
--- a/ADIS_Csharp/RobotClientWpf/MainWindow.xaml.cs
+++ b/ADIS_Csharp/RobotClientWpf/MainWindow.xaml.cs
@@ -13,6 +13,7 @@ namespace RobotClientWpf
     /// </summary>
     public partial class MainWindow : Window
     {
+        private static readonly NLog.Logger log = NLog.LogManager.GetCurrentClassLogger();
         private ChallengeFactory challenge;
         private bool manualDisconnect;
 
@@ -27,7 +28,11 @@ namespace RobotClientWpf
         {
             if(e == false)
             {
-                if (manualDisconnect == true) manualDisconnect = false; return;
+                if (manualDisconnect == true)
+                {
+                    manualDisconnect = false;
+                    return;
+                }
                 this.DisplayBottomMessage(MessageSeverity.Error, "Connection to MQTT broker lost.");
                 this.SetIpFieldsState(true, true, "Connect");
             }
diff --git a/ADIS_Csharp/RobotClientWpf/NLog.config b/ADIS_Csharp/RobotClientWpf/NLog.config
index 7da0939..7483624 100644
--- a/ADIS_Csharp/RobotClientWpf/NLog.config
+++ b/ADIS_Csharp/RobotClientWpf/NLog.config
@@ -1,27 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	  internalLogFile="c:\nlog-internal.txt" internalLogLevel="Trace">
+	<extensions>
+		<add assembly="NLogViewer"/>
+	</extensions>
 
-	<targets>
-		<target xsi:type="RichTextBox"
-				name="String"
-				layout="Layout"
-				height="Integer"
-				autoScroll="Boolean"
-				maxLines="Integer"
-				showMinimized="Boolean"
-				toolWindow="Boolean"
-				controlName="String"
-				formName="String"
-				width="Integer"
-				useDefaultRowColoringRules="Boolean">
-			<word-coloring backgroundColor="String" fontColor="String" ignoreCase="Boolean"
-						regex="String" style="Enum" text="String"
-						wholeWords="Boolean"/>
-			<!-- repeated -->
-			<row-coloring backgroundColor="String" condition="Condition" fontColor="String"
-					   style="Enum"/>
-			<!-- repeated -->
-		</target>
+	<targets async="true">
+		<target
+		  xsi:type="CacheTarget"
+		  name="cache"/>
 	</targets>
+
+	<rules>
+		<logger name="*" writeTo="cache" minlevel="Debug"/>
+	</rules>
 </nlog>
\ No newline at end of file
diff --git a/ADIS_Csharp/RobotClientWpf/RobotClientWpf.csproj b/ADIS_Csharp/RobotClientWpf/RobotClientWpf.csproj
index fed4496..8eb45f0 100644
--- a/ADIS_Csharp/RobotClientWpf/RobotClientWpf.csproj
+++ b/ADIS_Csharp/RobotClientWpf/RobotClientWpf.csproj
@@ -12,6 +12,10 @@
     <None Remove="Assets\robot-industrial.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Sentinel.NLogViewer" Version="2.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\RobotLib\RobotLib.csproj" />
   </ItemGroup>
@@ -25,4 +29,10 @@
     </Resource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="NLog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>