diff --git a/ClassToXaml.Windows/ClassToXaml.Windows.csproj b/ClassToXaml.Windows/ClassToXaml.Windows.csproj
index 9e99db0..bebdafd 100644
--- a/ClassToXaml.Windows/ClassToXaml.Windows.csproj
+++ b/ClassToXaml.Windows/ClassToXaml.Windows.csproj
@@ -12,7 +12,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Never</AppxBundle>
diff --git a/ClassToXaml.Windows/Package.appxmanifest b/ClassToXaml.Windows/Package.appxmanifest
index 7eda2a0..648e5c2 100644
--- a/ClassToXaml.Windows/Package.appxmanifest
+++ b/ClassToXaml.Windows/Package.appxmanifest
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
diff --git a/ClassToXaml.Windows/Properties/PublishProfiles/ClickOnceProfile.pubxml b/ClassToXaml.Windows/Properties/PublishProfiles/ClickOnceProfile.pubxml
new file mode 100644
index 0000000..983386d
--- /dev/null
+++ b/ClassToXaml.Windows/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.*</ApplicationVersion>
+    <BootstrapperEnabled>True</BootstrapperEnabled>
+    <Configuration>Release</Configuration>
+    <CreateWebPageOnPublish>False</CreateWebPageOnPublish>
+    <GenerateManifests>true</GenerateManifests>
+    <Install>True</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <IsRevisionIncremented>True</IsRevisionIncremented>
+    <IsWebBootstrapper>False</IsWebBootstrapper>
+    <MapFileExtensions>True</MapFileExtensions>
+    <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
+    <Platform>x64</Platform>
+    <PublishDir>bin\Release\net8.0-windows10.0.19041.0\win-x64\app.publish\</PublishDir>
+    <PublishUrl>bin\publish\</PublishUrl>
+    <PublishProtocol>ClickOnce</PublishProtocol>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishSingleFile>True</PublishSingleFile>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>True</SelfContained>
+    <SignatureAlgorithm>(none)</SignatureAlgorithm>
+    <SignManifests>False</SignManifests>
+    <SkipPublishVerification>false</SkipPublishVerification>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <UpdateEnabled>False</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateRequired>False</UpdateRequired>
+    <WebPageFileName>Publish.html</WebPageFileName>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/ClassToXaml.Windows/Properties/PublishProfiles/win-arm64.pubxml b/ClassToXaml.Windows/Properties/PublishProfiles/win-arm64.pubxml
deleted file mode 100644
index ceed00b..0000000
--- a/ClassToXaml.Windows/Properties/PublishProfiles/win-arm64.pubxml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Platform>x64</Platform>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishDir>bin\\\win-arm64\publish\</PublishDir>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">true</PublishReadyToRun>
-    <Configuration>Release</Configuration>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <PublishTrimmed>false</PublishTrimmed>
-    <!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
-    <!-- 
-		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
-		<TrimMode>partial</TrimMode>
-		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> 
-		-->
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/ClassToXaml/App.cs b/ClassToXaml/App.cs
index cb567d9..0740dcb 100644
--- a/ClassToXaml/App.cs
+++ b/ClassToXaml/App.cs
@@ -36,7 +36,7 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
         views.Register(
             new ViewMap(ViewModel: typeof(ShellViewModel)),
             new ViewMap<MainPage, MainViewModel>(),
-            new DataViewMap<SecondPage, SecondViewModel, Entity>()
+            new ViewMap<SecondPage, SecondViewModel>()
         );
 
         routes.Register(
diff --git a/ClassToXaml/Assets/logo.png b/ClassToXaml/Assets/logo.png
new file mode 100644
index 0000000..04ed920
Binary files /dev/null and b/ClassToXaml/Assets/logo.png differ
diff --git a/ClassToXaml/Presentation/MainPage.xaml b/ClassToXaml/Presentation/MainPage.xaml
index a176077..73f1743 100644
--- a/ClassToXaml/Presentation/MainPage.xaml
+++ b/ClassToXaml/Presentation/MainPage.xaml
@@ -24,26 +24,44 @@
             Grid.ColumnSpan="2"
             Margin="0,0,0,4"
             Content="Class To XAML(UWP, WinUI, WPF, MAUI)" />
-        <ToggleSwitch
-            x:Name="DarkModeToggle"
+        <StackPanel
             Grid.Column="1"
             HorizontalAlignment="Right"
-            Toggled="OnDarkModeToggleToggled">
-            <ToggleSwitch.OffContent>
-                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE708;" />
-            </ToggleSwitch.OffContent>
-            <ToggleSwitch.OnContent>
-                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE706;" />
-            </ToggleSwitch.OnContent>
-        </ToggleSwitch>
+            Orientation="Horizontal">
+            <ToggleSwitch x:Name="DarkModeToggle" Toggled="OnDarkModeToggleToggled">
+                <ToggleSwitch.OffContent>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE708;" />
+                </ToggleSwitch.OffContent>
+                <ToggleSwitch.OnContent>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE706;" />
+                </ToggleSwitch.OnContent>
+            </ToggleSwitch>
+            <AppBarButton
+                Command="{x:Bind VM.GoToSecond}"
+                Icon="Setting"
+                LabelPosition="Collapsed" />
+        </StackPanel>
         <TextBox
             Grid.Row="1"
             Margin="8,4"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
             AcceptsReturn="True"
-            PlaceholderText="ClassText"
+            Header="Class Text( Only Public properties will be use for XAML)"
+            PlaceholderText="Class Text( Only Public properties will be use for XAML)"
             Text="{x:Bind VM.InputText, Mode=TwoWay}" />
+        <Button
+            Grid.Row="1"
+            Margin="8,10"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Command="{x:Bind VM.ExampleCommand}"
+            Content="Example"
+            Style="{StaticResource SecondarySmallFabStyle}">
+            <um:ControlExtensions.Icon>
+                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE943;" />
+            </um:ControlExtensions.Icon>
+        </Button>
         <Grid
             Grid.Row="1"
             Grid.RowSpan="3"
@@ -281,7 +299,11 @@
                 HorizontalAlignment="Stretch"
                 Command="{x:Bind VM.GenerateCommand}"
                 Content="Generate XAML"
-                CornerRadius="4" />
+                CornerRadius="4">
+                <um:ControlExtensions.Icon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xF133;" />
+                </um:ControlExtensions.Icon>
+            </Button>
             <Button
                 Grid.Column="1"
                 Height="60"
@@ -289,7 +311,11 @@
                 HorizontalAlignment="Stretch"
                 Command="{x:Bind VM.CopyCommand}"
                 Content="Copy"
-                CornerRadius="4" />
+                CornerRadius="4">
+                <um:ControlExtensions.Icon>
+                    <SymbolIcon Symbol="Copy" />
+                </um:ControlExtensions.Icon>
+            </Button>
             <!--<Button
                 Grid.Column="2"
                 Height="60"
@@ -305,7 +331,11 @@
                 HorizontalAlignment="Stretch"
                 Command="{x:Bind VM.ClearCommand}"
                 Content="Clear"
-                CornerRadius="4" />
+                CornerRadius="4">
+                <um:ControlExtensions.Icon>
+                    <SymbolIcon Symbol="Delete" />
+                </um:ControlExtensions.Icon>
+            </Button>
 
         </Grid>
         <TextBox
diff --git a/ClassToXaml/Presentation/MainViewModel.cs b/ClassToXaml/Presentation/MainViewModel.cs
index 9f66135..e284b98 100644
--- a/ClassToXaml/Presentation/MainViewModel.cs
+++ b/ClassToXaml/Presentation/MainViewModel.cs
@@ -1,4 +1,5 @@
 using System.Text;
+using System.Text.RegularExpressions;
 
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -19,9 +20,7 @@ public partial class MainViewModel : ObservableObject
     public MainViewModel(INavigator navigator)
     {
         _navigator = navigator;
-        // Title = "Main";
-        GoToSecond = new AsyncRelayCommand(GoToSecondView);
-        NoOfColumn = 1;
+        NoOfColumn = 2;
         IsUseGrid = true;
         IsUseTextBlock = false;
         IsUseTwoWayBinding = true;
@@ -60,6 +59,15 @@ public MainViewModel(INavigator navigator)
     private string? styleForDateTime;
     [ObservableProperty]
     private string? styleForCombo;
+    public string placeHolder => @"public class Name
+{
+    public string maiden { get; set; }
+    public string suffix { get; set; }
+    public string givenName { get; set; }
+    public string middleName { get; set; }
+    public string surname { get; set; }
+
+}";
     public RelayCommand GenerateCommand => new RelayCommand(OnGenerateCommandExecuted);
     public RelayCommand CopyCommand => new RelayCommand(OnCopyCommandExecuted);
     public RelayCommand ClearCommand => new RelayCommand(OnClearCommandExecuted);
@@ -129,12 +137,79 @@ public void GenerateXamlForClass()
     {
         OutputText = GenerateXamlForClass(InputText, NoOfColumn);
     }
+    private static string ExtractClassName(string classText)
+    {
+        // Regular expression to extract class name
+        string classNamePattern = @"public\s+class\s+(\w+)";
+        var classNameMatch = Regex.Match(classText, classNamePattern);
+
+        if (classNameMatch.Success)
+        {
+            return classNameMatch.Groups[1].Value;
+        }
+
+        return string.Empty;
+    }
+    private static List<string> ExtractClassDefinitions(string fileContent)
+    {
+        List<string> classDefinitions = new List<string>();
+        string classPattern = @"public\s+class\s+\w+\s*{";
+        MatchCollection matches = Regex.Matches(fileContent, classPattern);
+        foreach (Match match in matches)
+        {
+            int startIndex = match.Index;
+            int openBraces = 0;
+            int endIndex = startIndex;
+            for (int i = startIndex; i < fileContent.Length; i++)
+            {
+                if (fileContent[i] == '{')
+                {
+                    openBraces++;
+                }
+                else if (fileContent[i] == '}')
+                {
+                    openBraces--;
+                    if (openBraces == 0)
+                    {
+                        endIndex = i;
+                        break;
+                    }
+                }
+            }
+
+            string classDefinition = fileContent.Substring(startIndex, endIndex - startIndex + 1);
+            classDefinitions.Add(classDefinition);
+        }
+
+        return classDefinitions;
+    }
     public string GenerateXamlForClass(string classText, int columnCount)
     {
         if (classText == null)
         {
             return string.Empty;
         }
+        StringBuilder xamlText = new();
+        string classPattern = @"public\s+class\s+\w+\s*{";
+        var classMatches = Regex.Matches(classText, classPattern);
+        if (classMatches.Count > 1)
+        {
+            List<string> classDefinitions = ExtractClassDefinitions(classText);
+            foreach (string text in classDefinitions)
+            {
+                xamlText.AppendLine($"  <!--///////////////XAML for class {ExtractClassName(text)}/////////////-->");
+                xamlText.AppendLine(GenerateXaml(text, columnCount));
+            }
+        }
+        else if (classMatches.Count == 1)
+        {
+            return GenerateXaml(classText, columnCount);
+        }
+        return xamlText.ToString();
+    }
+
+    private string GenerateXaml(string classText, int columnCount)
+    {
         var properties = GetPublicProperty(classText);
         if (properties == null || !properties.Any())
         {
@@ -225,7 +300,7 @@ private string AddMargin()
         }
         return $"Margin=\"{Margin}\"";
     }
-    Dictionary<string, string> typeMap = new(StringComparer.OrdinalIgnoreCase)
+    private Dictionary<string, string> typeMap = new(StringComparer.OrdinalIgnoreCase)
        {
            { "TextBlock", "Label" },
            { "TextBox", "Entry" },
@@ -272,11 +347,7 @@ private void GenerateControlText(int columnCount, StringBuilder xamlBuilder, int
         }
     }
 
-    public ICommand GoToSecond { get; }
-
-    private async Task GoToSecondView()
-    {
-        await _navigator.NavigateViewModelAsync<SecondViewModel>(this, data: new Entity(Name!));
-    }
+    public ICommand GoToSecond => new AsyncRelayCommand(async () => await _navigator.NavigateViewModelAsync<SecondViewModel>(this));
+    public ICommand ExampleCommand => new RelayCommand(() => InputText = placeHolder);
 
 }
diff --git a/ClassToXaml/Presentation/SecondPage.xaml b/ClassToXaml/Presentation/SecondPage.xaml
index 755ff11..c6a66dd 100644
--- a/ClassToXaml/Presentation/SecondPage.xaml
+++ b/ClassToXaml/Presentation/SecondPage.xaml
@@ -1,36 +1,48 @@
-<Page x:Class="ClassToXaml.Presentation.SecondPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:ClassToXaml.Presentation"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:uen="using:Uno.Extensions.Navigation.UI"
-      xmlns:utu="using:Uno.Toolkit.UI"
-      xmlns:um="using:Uno.Material"
-      Background="{ThemeResource BackgroundBrush}">
+<Page
+    x:Class="ClassToXaml.Presentation.SecondPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:ClassToXaml.Presentation"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uen="using:Uno.Extensions.Navigation.UI"
+    xmlns:um="using:Uno.Material"
+    xmlns:utu="using:Uno.Toolkit.UI"
+    Background="{ThemeResource BackgroundBrush}">
 
-  <Grid utu:SafeArea.Insets="VisibleBounds">
-    <Grid.RowDefinitions>
-      <RowDefinition Height="Auto" />
-      <RowDefinition />
-    </Grid.RowDefinitions>
-    <utu:NavigationBar Content="Second Page">
-      <utu:NavigationBar.MainCommand>
-        <AppBarButton>
-          <AppBarButton.Icon>
-            <BitmapIcon UriSource="ms-appx:///ClassToXaml/Assets/Icons/back.png" />
-          </AppBarButton.Icon>
-        </AppBarButton>
-      </utu:NavigationBar.MainCommand>
-    </utu:NavigationBar>
-    <StackPanel Grid.Row="1"
-          HorizontalAlignment="Center"
-          VerticalAlignment="Center">
-      <TextBlock Text="{Binding Entity.Name}"
-        HorizontalAlignment="Center"
-        VerticalAlignment="Center"
-        Margin="8" />
-    </StackPanel>
+    <Grid utu:SafeArea.Insets="VisibleBounds">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <utu:NavigationBar Content="Setting">
+            <utu:NavigationBar.MainCommand>
+                <AppBarButton>
+                    <AppBarButton.Icon>
+                        <BitmapIcon UriSource="ms-appx:///ClassToXaml/Assets/Icons/back.png" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+            </utu:NavigationBar.MainCommand>
+        </utu:NavigationBar>
+        <StackPanel
+            Grid.Row="1"
+            Width="500"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center">
 
-  </Grid>
+            <Image Width="200" Source="/ClassToXaml/Assets/logo.png" />
+
+            <TextBlock
+                Margin="0,20,0,0"
+                FontSize="14"
+                Text="The Class to XAML Application is a comprehensive guide and open source toolkit designed to streamline the process of converting C# classes into XAML (Extensible Application Markup Language) for use in UWP/WinUI/WPF/MAUI/Uno-Platform applications. This tool enables developers to effortlessly create and manage the user interface (UI) elements of their applications by bridging the gap between the back-end logic written in C# and the front-end design in XAML." />
+
+            <HyperlinkButton
+                Margin="0,20,0,0"
+                Content="Github repo"
+                NavigateUri="https://github.com/avikeid2007/ClassToXaml"
+                Style="{StaticResource MaterialHyperlinkButtonStyle}" />
+        </StackPanel>
+
+    </Grid>
 </Page>
diff --git a/ClassToXaml/Presentation/SecondViewModel.cs b/ClassToXaml/Presentation/SecondViewModel.cs
index 6ecf447..dc0b436 100644
--- a/ClassToXaml/Presentation/SecondViewModel.cs
+++ b/ClassToXaml/Presentation/SecondViewModel.cs
@@ -1,5 +1,5 @@
 namespace ClassToXaml.Presentation;
 
-public partial record SecondViewModel(Entity Entity)
+public partial record SecondViewModel()
 {
 }