diff --git a/src/Client/Pages/Identity/Users/Users.razor.cs b/src/Client/Pages/Identity/Users/Users.razor.cs
index 609412a..1f6c719 100644
--- a/src/Client/Pages/Identity/Users/Users.razor.cs
+++ b/src/Client/Pages/Identity/Users/Users.razor.cs
@@ -47,8 +47,6 @@ protected override async Task OnInitializedAsync()
             deleteAction: string.Empty,
             fields: new()
             {
-                new(user => user.FirstName, L["First Name"]),
-                new(user => user.LastName, L["Last Name"]),
                 new(user => user.UserName, L["UserName"]),
                 new(user => user.Email, L["Email"]),
                 new(user => user.PhoneNumber, L["PhoneNumber"]),
@@ -59,8 +57,6 @@ protected override async Task OnInitializedAsync()
             loadDataFunc: async () => (await UsersClient.GetListAsync()).ToList(),
             searchFunc: (searchString, user) =>
                 string.IsNullOrWhiteSpace(searchString)
-                    || user.FirstName?.Contains(searchString, StringComparison.OrdinalIgnoreCase) == true
-                    || user.LastName?.Contains(searchString, StringComparison.OrdinalIgnoreCase) == true
                     || user.Email?.Contains(searchString, StringComparison.OrdinalIgnoreCase) == true
                     || user.PhoneNumber?.Contains(searchString, StringComparison.OrdinalIgnoreCase) == true
                     || user.UserName?.Contains(searchString, StringComparison.OrdinalIgnoreCase) == true,
diff --git a/src/Client/Pages/Index.razor b/src/Client/Pages/Index.razor
index 362ae97..73cec12 100644
--- a/src/Client/Pages/Index.razor
+++ b/src/Client/Pages/Index.razor
@@ -6,77 +6,19 @@
 <MudContainer>
     <MudGrid>
         <MudItem xs="12" sm="12" md="12">
-            <div class="d-flex justify-center mt-4">
-                 <img src="rp-logo.png" Style="height:250px" />
-            </div>
-        </MudItem>
-        <MudItem xs="12" sm="12" md="12">
-            <MudText Align="Align.Center" Typo="Typo.h5" Class="smaller">@L["RewardsPlus"]</MudText>
-         <MudText Align="Align.Center" Typo="Typo.h4">@L["RewardsPlus WebAssembly Client"]</MudText>
+         <MudText Align="Align.Center" Typo="Typo.h4">@L["👋 Explore Rewards+ Loyalty"]</MudText>
 
         </MudItem>
-        <MudItem xs="12" sm="12" md="12">
-            <MudText Align="Align.Center">
-                @L["Built with the goodness of"] <MudLink Href="https://www.mudblazor.com" Target="_blank">MudBlazor</MudLink> @L["Component Library"].
-            </MudText>
-            <MudText Align="Align.Center">
-                @L["Compatible with"] <MudLink Href="https://github.com/fullstackhero/dotnet-webapi-boilerplate" Target="_blank">fullstackhero .NET WebAPI Boilerplate v1.</MudLink>
-            </MudText>
-        </MudItem>
         <MudItem xs="12" sm="12" md="12">
            <div class="mud-typography-align-center">
-                <MudButton Variant="Variant.Filled" Color="Color.Primary" Link="https://fullstackhero.net/basics/getting-started/" Target="_blank" StartIcon="@Icons.Material.Filled.Rocket">@L["Get Started"]</MudButton>
-                <MudButton Variant="Variant.Outlined" Style="margin-left:5px" Color="Color.Default" Link="https://github.com/fullstackhero/blazor-wasm-boilerplate" Target="_blank" StartIcon="@Icons.Custom.Brands.GitHub">@L["Star on GitHub"]</MudButton>
+                <MudButton Variant="Variant.Filled" Color="Color.Primary" Target="_blank" StartIcon="@Icons.Material.Filled.Rocket">@L["Get Started"]</MudButton>
             </div>
         </MudItem>
         <MudItem xs="12" sm="12" md="12">
              <MudText Align="Align.Center">@L["Version 1.0"]</MudText>
         </MudItem>
-        <MudItem xs="12" sm="12" md="12">
-            <MudExpansionPanels>
-                <MudExpansionPanel Class="mud-elevation-25" Text="@L["Getting Started"]" MaxHeight="150">
-                    @L["In case you are stuck anywhere or have any queries regarding this implementation, I have compiled a Quick Start Guide for you reference."]
-                    <MudButton Variant="Variant.Text" DisableElevation="true" Color="Color.Secondary" Link="https://fullstackhero.net/blazor-wasm-boilerplate/general/getting-started" Target="_blank">@L["Read The Guide"]</MudButton>
-                </MudExpansionPanel>
-                <MudExpansionPanel Class="mud-elevation-25" Text="@L["Important Links"]" MaxHeight="500">
-                    <MudList Clickable="true">
-                        <MudListItem Text="@L["Github Repository : Do Not Forget to Leave a Star ;)"]" Href="https://github.com/fullstackhero/blazor-wasm-boilerplate" />
-                        <MudListItem Text="@L["Quick Start Guide"]" Href="https://fullstackhero.net/blazor-wasm-boilerplate/general/getting-started" />
-                    </MudList>
-                </MudExpansionPanel>
-                <MudExpansionPanel Class="mud-elevation-25" Text="@L["Learning Resources"]" MaxHeight="1000">
-                    @L["Here are few articles that should help you get started with Blazor."]
-                    <MudList Clickable="true">
-                        <MudListItem Text="@L["Blazor For Beginners – Getting Started With Blazor"]" Href="https://codewithmukesh.com/blog/getting-started-with-blazor/" />
-                        <MudListItem Text="@L["Exploring Blazor Project Structure"]" Href="https://codewithmukesh.com/blog/exploring-blazor-project-structure/" />
-                        <MudListItem Text="@L["Onion Architecture In ASP.NET Core With CQRS – Detailed"]" Href="https://codewithmukesh.com/blog/onion-architecture-in-aspnet-core/" />
-                        <MudListItem Text="@L["How To Implement Blazor CRUD Using Entity Framework Core?"]" Href="https://codewithmukesh.com/blog/blazor-crud-with-entity-framework-core/" />
-                        <MudListItem Text="@L["Custom Authentication In Blazor WebAssembly – Detailed"]" Href="https://codewithmukesh.com/blog/authentication-in-blazor-webassembly/" />
-                        <MudListItem Text="@L["Implementing Blazor CRUD Using Mudblazor Component Library In .NET 5"]" Href="https://codewithmukesh.com/blog/blazor-crud-using-mudblazor/" />
-                        <MudListItem Text="@L["Building A Chat Application With Blazor, Identity, And SignalR"]" Href="https://codewithmukesh.com/blog/realtime-chat-application-with-blazor/" />
-                    </MudList>
-                </MudExpansionPanel>
-                 <MudExpansionPanel Class="mud-elevation-25" Text="@L["User Claims"]">
-                    @L["Application Claims of the currently logged in user."]
-                     <MudList Dense="true">
-                @if (Claims is not null)
-                {
-                    @foreach (var claim in Claims)
-                    {
-                        <MudListItem>
-                            <MudChip>
-                                @claim.Type
-                            </MudChip>
-                            @claim.Value
-                        </MudListItem>
-                    }
-                }
-            </MudList>
-                </MudExpansionPanel>
-            </MudExpansionPanels>
-        </MudItem>
         <MudItem  xs="12" sm="12" md="12">
-            <MudAlert Style="margin-top:10px;justify-content:center" Severity="Severity.Info"><MudLink Href="https://github.com/fullstackhero/blazor-wasm-boilerplate">@L["Liked this Boilerplate? Star us on Github!"]</MudLink></MudAlert>
+            <MudAlert Style="margin-top:10px;justify-content:center" Severity="Severity.Info"><MudLink Href="https://github.com/bharathwajv/RewardsPlus">@L["Liked this? Star on Github!"]</MudLink></MudAlert>
         </MudItem>
     </MudGrid>
 </MudContainer>
diff --git a/src/Client/Shared/BaseLayout.razor.cs b/src/Client/Shared/BaseLayout.razor.cs
index 0bb3d81..b5f4fbb 100644
--- a/src/Client/Shared/BaseLayout.razor.cs
+++ b/src/Client/Shared/BaseLayout.razor.cs
@@ -17,17 +17,10 @@ protected override async Task OnInitializedAsync()
         if (_themePreference == null) _themePreference = new ClientPreference();
         SetCurrentTheme(_themePreference);
 
-        Snackbar.Add("Like this boilerplate? ", Severity.Normal, config =>
+        Snackbar.Add("Always Welcome You", Severity.Normal, config =>
         {
             config.BackgroundBlurred = true;
-            config.Icon = Icons.Custom.Brands.GitHub;
-            config.Action = "Star us on Github!";
             config.ActionColor = Color.Primary;
-            config.Onclick = snackbar =>
-            {
-                Navigation.NavigateTo("https://github.com/fullstackhero/blazor-wasm-boilerplate");
-                return Task.CompletedTask;
-            };
         });
     }
 
diff --git a/src/Client/Shared/MainLayout.razor b/src/Client/Shared/MainLayout.razor
index 085f12f..8220502 100644
--- a/src/Client/Shared/MainLayout.razor
+++ b/src/Client/Shared/MainLayout.razor
@@ -9,58 +9,14 @@
             @L["RewardsPlus"]</MudButton>
     <MudSpacer />
     <MudHidden Breakpoint="Breakpoint.MdAndUp" Invert="true">
-        <MudButton DisableElevation Variant="Variant.Filled" Color="Color.Secondary"
-            Link="https://opencollective.com/fullstackhero" Target="_blank" StartIcon="@Icons.Material.Filled.Favorite">
-            @L["Sponsor"]</MudButton>
-        <MudDivider Vertical="true" FlexItem="true" DividerType="DividerType.Middle" Class="mx-4 my-5" />
-        <MudTooltip Text="Support">
-            <MudMenu Icon="@Icons.Filled.SupportAgent" Color="Color.Inherit" Dense="true" Direction="Direction.Right"
-                OffsetY="true">
-                <MudText Typo="Typo.body2" Class="px-4 py-2"><b>@L["Community"]</b></MudText>
-                <MudMenuItem Link="https://discord.gg/yQWpShsKrf" Target="_blank">@L["Discord"]</MudMenuItem>
-                <MudMenuItem Link="https://www.facebook.com/codewithmukesh" Target="_blank">@L["Facebook"]
-                </MudMenuItem>
-                <MudMenuItem Link="https://www.linkedin.com/in/iammukeshm/" Target="_blank">LinkedIn</MudMenuItem>
-                <MudMenuItem Link="https://www.buymeacoffee.com/codewithmukesh" Target="_blank">Buy Me a Coffee!
-                </MudMenuItem>
-                <MudMenuItem Link="https://opencollective.com/fullstackhero" Target="_blank">Open Collective
-                </MudMenuItem>
-                <MudText Typo="Typo.body2" Class="px-4 py-2"><b>@L["Resources"]</b></MudText>
-                <MudMenuItem Link="https://fullstackhero.net/" Target="_blank">@L["Documentation"]
-                </MudMenuItem>
-            </MudMenu>
-        </MudTooltip>
         <LanguageSelector />
         <MudTooltip Text="Fork Repository">
             <MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Inherit"
-                Link="https://github.com/fullstackhero/blazor-wasm-boilerplate" Target="_blank" />
+                Link="https://github.com/bharathwajv/RewardsPlus" Target="_blank" />
         </MudTooltip>
         <NotificationConnectionStatus></NotificationConnectionStatus>
     </MudHidden>
     <MudHidden Breakpoint="Breakpoint.SmAndDown" Invert="true">
-        <MudTooltip Text="Sponsor">
-            <MudIconButton Icon="@Icons.Material.Filled.Favorite" Color="Color.Inherit"
-                Link="https://opencollective.com/fullstackhero" Target="_blank" />
-        </MudTooltip>
-        <MudMenu Icon="@Icons.Filled.Settings" Color="Color.Inherit" Dense="true" Direction="Direction.Right"
-            OffsetY="true">
-            <div class="px-2">
-                <MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Inherit"
-                    Link="https://github.com/fullstackhero/blazor-wasm-boilerplate" Target="_blank" />
-                <MudIconButton Icon="@Icons.Material.Filled.Coffee" Color="Color.Inherit"
-                    Link="https://www.buymeacoffee.com/codewithmukesh" Target="_blank" />
-            </div>
-            <MudText Typo="Typo.body2" Class="px-4 py-2"><b>@L["Community"]</b></MudText>
-            <MudMenuItem Link="https://discord.gg/yQWpShsKrf" Target="_blank">@L["Discord"]</MudMenuItem>
-            <MudMenuItem Link="https://www.facebook.com/codewithmukesh" Target="_blank">@L["Facebook"]
-            </MudMenuItem>
-            <MudMenuItem Link="https://www.linkedin.com/in/iammukeshm/" Target="_blank">LinkedIn</MudMenuItem>
-            <MudText Typo="Typo.body2" Class="px-4 py-2"><b>@L["Resources"]</b></MudText>
-            <MudMenuItem Link="https://mudblazor.com/getting-started/installation" Target="_blank">
-                @L["MudBlazor Documentation"]</MudMenuItem>
-            <MudMenuItem Link="https://fullstackhero.net/getting-started/" Target="_blank">
-                @L["Quick-Start Guide"]</MudMenuItem>
-        </MudMenu>
         <NotificationConnectionStatus></NotificationConnectionStatus>
     </MudHidden>
     <MudMenu AnchorOrigin="Origin.BottomRight" LockScroll="true" TransformOrigin="Origin.TopRight">
diff --git a/src/Client/Shared/NavMenu.razor b/src/Client/Shared/NavMenu.razor
index 9ccb1ba..f536ee9 100644
--- a/src/Client/Shared/NavMenu.razor
+++ b/src/Client/Shared/NavMenu.razor
@@ -5,8 +5,6 @@
 <MudNavMenu>
     <MudText Typo="Typo.subtitle2" Color="Color.Primary" Class="ml-4 my-3">@L["Start"]</MudText>
     <MudNavLink Href="/" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Home">@L["Home"]</MudNavLink>
-    <MudNavLink Href="https://fullstackhero.net/basics/getting-started/" Match="NavLinkMatch.All" Target="_blank"
-        Icon="@Icons.Material.Filled.RocketLaunch">@L["Getting Started"]</MudNavLink>
     @if (_canViewHangfire)
     {
         <MudNavLink Href="@_hangfireUrl" Match="NavLinkMatch.All" Target="_blank" Icon="@Icons.Material.Filled.Work">@L["Hangfire"]</MudNavLink>
diff --git a/src/Client/wwwroot/appsettings.json b/src/Client/wwwroot/appsettings.json
index 704cf56..1a49bec 100644
--- a/src/Client/wwwroot/appsettings.json
+++ b/src/Client/wwwroot/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ApiBaseUrl": "https://localhost:5001/",
-  "AuthProvider": "Jwt",
+    "AuthProvider": "Jwt",
   "AzureAd": {
     "Authority": "https://login.microsoftonline.com/organizations",
     "ClientId": "<Client (Application) Id of your client app registered in Azure>",
diff --git a/src/Client/wwwroot/index.html b/src/Client/wwwroot/index.html
index 5ca6c95..10b4177 100644
--- a/src/Client/wwwroot/index.html
+++ b/src/Client/wwwroot/index.html
@@ -48,6 +48,7 @@
                 top: 50%;
                 transform: translate(-50%, -50%)
             }
+
         </style>
 
         <div style="height:100%;width:100%;margin:0;position:fixed;">
@@ -55,9 +56,12 @@
             <div class="fsh-wasm" style="animation-direction:alternate-reverse;animation-duration:2s;"></div>
             <div class="fsh-wasm" style="animation-duration:5s;"></div>
             <div class="fsh-wasm-cont ">
-                <img src="/rp-logo.png" Style="height:550px; width:550px;" />
+                <div style="overflow:hidden;">
+                    <img src="/rp-logo.png" Style="height: 400px; width: 400px; margin: -30% 0px -40% 0px;" />
+                </div>
+                    <div style="font-family: 'Jost'; color: #3eaf7c; font-size: 20px;">Getting things ready for you...</div>
+                </div>
             </div>
-        </div>
     </div>
 
     <div id="blazor-error-ui">
diff --git a/src/Host/.config/dotnet-tools.json b/src/Host/.config/dotnet-tools.json
new file mode 100644
index 0000000..e80b80f
--- /dev/null
+++ b/src/Host/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "6.0.5",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
\ No newline at end of file