diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
index 4e5ca7220..ddc37cbf5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
@@ -1,152 +1,64 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\common.props" />
+	<Import Project="..\..\common.props" />
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
-    <IsPackable>true</IsPackable>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Unity.Flex.Web</RootNamespace>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+		<IsPackable>true</IsPackable>
+		<OutputType>Library</OutputType>
+		<RootNamespace>Unity.Flex.Web</RootNamespace>
+		<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.4" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="8.3.4" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+		<PackageReference Include="System.Text.Json" Version="8.0.5" />
+		<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.4" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="8.3.4" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.8" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.8" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Pages\**\*.css" />
-    <EmbeddedResource Include="Pages\**\*.js" />
-    <EmbeddedResource Include="Components\**\*.js" />
-    <EmbeddedResource Include="Components\**\*.css" />
-    <EmbeddedResource Include="wwwroot\**\*.*" />
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Pages\**\*.css" />
+		<EmbeddedResource Include="Pages\**\*.js" />
+		<EmbeddedResource Include="Components\**\*.js" />
+		<EmbeddedResource Include="Components\**\*.css" />
+		<EmbeddedResource Include="Views\**\*.js" />
+		<EmbeddedResource Include="Views\**\*.css" />
+		<EmbeddedResource Include="wwwroot\**\*.*" />
+		<Content Remove="Pages\**\*.css" />
+		<Content Remove="Pages\**\*.js" />
+		<Content Remove="Components\**\*.js" />
+		<Content Remove="Components\**\*.css" />
+		<Content Remove="Views\**\*.js" />
+		<Content Remove="Views\**\*.css" />
+		<Content Remove="wwwroot\**\*.*" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Pages\WorksheetConfiguration\Index.css" />
-    <None Remove="Pages\WorksheetConfiguration\Index.js" />
-    <None Remove="Views\Shared\Components\BCAddressWidget\Default.js" />
-    <None Remove="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.css" />
-    <None Remove="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\CheckboxGroupWidget\Default.css" />
-    <None Remove="Views\Shared\Components\CheckboxGroupWidget\Default.js" />
-    <None Remove="Views\Shared\Components\CheckboxWidget\Default.css" />
-    <None Remove="Views\Shared\Components\CheckboxWidget\Default.js" />
-    <None Remove="Views\Shared\Components\Common\KeyValueComponents.js" />
-    <None Remove="Views\Shared\Components\CurrencyWidget\Default.js" />
-    <None Remove="Views\Shared\Components\CustomFieldDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\CustomTabWidget\Default.css" />
-    <None Remove="Views\Shared\Components\CustomTabWidget\Default.js" />
-    <None Remove="Views\Shared\Components\DataGridDefinitionWidget\Default.css" />
-    <None Remove="Views\Shared\Components\DataGridDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\DataGridWidget\Default.css" />
-    <None Remove="Views\Shared\Components\DataGridWidget\Default.js" />
-    <None Remove="Views\Shared\Components\DateWidget\Default.js" />
-    <None Remove="Views\Shared\Components\NumericDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\QuestionDefinitionWidget\Default.css" />
-    <None Remove="Views\Shared\Components\QuestionDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.css" />
-    <None Remove="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\RadioDefinitionWidget\Default.css" />
-    <None Remove="Views\Shared\Components\RadioDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\RadioWidget\Default.css" />
-    <None Remove="Views\Shared\Components\RadioWidget\Default.js" />
-    <None Remove="Views\Shared\Components\Scoresheet\Scoresheet.css" />
-    <None Remove="Views\Shared\Components\Scoresheet\Scoresheet.js" />
-    <None Remove="Views\Shared\Components\SelectListDefinitionWidget\Default.css" />
-    <None Remove="Views\Shared\Components\SelectListDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\SelectListWidget\Default.js" />
-    <None Remove="Views\Shared\Components\CurrencyDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\TextAreaWidget\Default.js" />
-    <None Remove="Views\Shared\Components\TextDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\WorksheetInstanceWidget\Default.css" />
-    <None Remove="Views\Shared\Components\WorksheetInstanceWidget\Default.js" />
-    <None Remove="Views\Shared\Components\WorksheetListWidget\WorksheetList.css" />
-    <None Remove="Views\Shared\Components\WorksheetListWidget\WorksheetList.js" />
-    <None Remove="Views\Shared\Components\WorksheetWidget\Worksheet.css" />
-    <None Remove="Views\Shared\Components\WorksheetWidget\Worksheet.js" />
-    <None Remove="Views\Shared\Components\QuestionYesNoDefinitionWidget\Default.js" />
-    <None Remove="Views\Shared\Components\YesNoWidget\Default.js" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
+		<ProjectReference Include="..\Unity.Flex.Application.Contracts\Unity.Flex.Application.Contracts.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Views\Shared\Components\BCAddressWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\CheckboxGroupWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\CheckboxGroupWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\CheckboxWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\CheckboxWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\Common\KeyValueComponents.js" />
-    <EmbeddedResource Include="Views\Shared\Components\CurrencyWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\CustomFieldDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\CustomTabWidget\Default.js">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Shared\Components\CustomTabWidget\Default.css">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Shared\Components\DataGridDefinitionWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\DataGridDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\DataGridWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\DataGridWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\DateWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\NumericDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\QuestionDefinitionWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\QuestionDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\RadioDefinitionWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\RadioDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\RadioWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\RadioWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\Scoresheet\Scoresheet.css" />
-    <EmbeddedResource Include="Views\Shared\Components\Scoresheet\Scoresheet.js" />
-    <EmbeddedResource Include="Views\Shared\Components\SelectListDefinitionWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\SelectListDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\SelectListWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\CurrencyDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\TextAreaDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\TextAreaWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\TextDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\WorksheetInstanceWidget\Default.css" />
-    <EmbeddedResource Include="Views\Shared\Components\WorksheetInstanceWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\WorksheetListWidget\WorksheetList.css" />
-    <EmbeddedResource Include="Views\Shared\Components\WorksheetListWidget\WorksheetList.js" />
-    <EmbeddedResource Include="Views\Shared\Components\WorksheetWidget\Worksheet.css" />
-    <EmbeddedResource Include="Views\Shared\Components\WorksheetWidget\Worksheet.js" />
-    <EmbeddedResource Include="Views\Shared\Components\QuestionYesNoDefinitionWidget\Default.js" />
-    <EmbeddedResource Include="Views\Shared\Components\YesNoWidget\Default.js" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Update="Views\Shared\Components\RadioDefinitionWidget\Default.cshtml">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
-    <ProjectReference Include="..\Unity.Flex.Application.Contracts\Unity.Flex.Application.Contracts.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Update="Views\Shared\Components\RadioDefinitionWidget\Default.cshtml">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
-    <PackageReference Update="Fody" Version="6.8.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
+		<PackageReference Update="Fody" Version="6.8.1">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 
 </Project>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
index 118f08dc5..5359600df 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics.Metrics;
-using Unity.GrantManager.Localization;
+using Unity.GrantManager.Localization;
 using Unity.Modules.Shared;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs
index bf2b2e44d..1dc9206fe 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs
@@ -118,7 +118,12 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId, Guid app
 
 
             decimal projectFundingTotal = application.ProjectFundingTotal ?? 0;
-            double percentageTotalProjectBudget = application.PercentageTotalProjectBudget ?? 0;
+            double percentageTotalProjectBudget;
+
+            if (application.TotalProjectBudget == 0)
+                percentageTotalProjectBudget = application.PercentageTotalProjectBudget ?? 0;
+            else
+                percentageTotalProjectBudget = decimal.Multiply(decimal.Divide(application.RequestedAmount, application.TotalProjectBudget), 100).To<double>();
 
             if (projectFundingTotal == 0)
             {
@@ -126,8 +131,6 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId, Guid app
                 projectFundingTotal = (projectFundingTotal > ProjectFundingMax) ? ProjectFundingMax : projectFundingTotal;
             }
 
-            percentageTotalProjectBudget = application.TotalProjectBudget == 0 ? 0 : decimal.Multiply(decimal.Divide(application.RequestedAmount, application.TotalProjectBudget), 100).To<double>();
-
             model.ProjectInfo = new()
             {
                 ProjectName = application.ProjectName,