diff --git a/LICENSE b/LICENSE
index 6b68cd26..81e8cb41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2021 .NET Foundation
+Copyright (c) 2018-2022 .NET Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
index 14f64da5..92b73433 100644
--- a/Oqtane.Client/App.razor
+++ b/Oqtane.Client/App.razor
@@ -30,28 +30,32 @@
 }
 
 @code {
-    [Parameter]
-    public string AntiForgeryToken { get; set; }
+	[Parameter]
+	public string AntiForgeryToken { get; set; }
 
-    [Parameter]
-    public string Runtime { get; set; }
+	[Parameter]
+	public string Runtime { get; set; }
 
-    [Parameter]
-    public string RenderMode { get; set; }
+	[Parameter]
+	public string RenderMode { get; set; }
 
-    [Parameter]
-    public int VisitorId { get; set; }
+	[Parameter]
+	public int VisitorId { get; set; }
 
-    private bool _initialized = false;
-    private string _display = "display: none;";
-    private Installation _installation = new Installation { Success = false, Message = "" };
+	[Parameter]
+	public string RemoteIPAddress { get; set; }
 
-    private PageState PageState { get; set; }
+	private bool _initialized = false;
+	private string _display = "display: none;";
+	private Installation _installation = new Installation { Success = false, Message = "" };
 
-    protected override async Task OnParametersSetAsync()
-    {
-        SiteState.AntiForgeryToken = AntiForgeryToken;
-        InstallationService.SetAntiForgeryTokenHeader(AntiForgeryToken);
+	private PageState PageState { get; set; }
+
+	protected override async Task OnParametersSetAsync()
+	{
+		SiteState.RemoteIPAddress = RemoteIPAddress;
+		SiteState.AntiForgeryToken = AntiForgeryToken;
+		InstallationService.SetAntiForgeryTokenHeader(AntiForgeryToken);
 
         _installation = await InstallationService.IsInstalled();
         if (_installation.Alias != null)
diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
index 6c665ba2..3e3eb82c 100644
--- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
@@ -27,6 +27,6 @@
     protected override void OnInitialized()
     {
         var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
-        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
+        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId && !item.IsDeleted).ToList();
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 72e56897..120ede22 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -36,7 +36,9 @@
                     <option value="m">@Localizer["Minute(s)"]</option>
                     <option value="H">@Localizer["Hour(s)"]</option>
                     <option value="d">@Localizer["Day(s)"]</option>
+                    <option value="w">@Localizer["Week(s)"]</option>
                     <option value="M">@Localizer["Month(s)"]</option>
+                    <option value="O">@Localizer["Once"]</option>
                 </select>
             </div>
         </div>
@@ -95,82 +97,89 @@
 </form>
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
-    private int _jobId;
-    private string _name = string.Empty;
-    private string _jobType = string.Empty;
-    private string _isEnabled = "True";
-    private string _interval = string.Empty;
-    private string _frequency = string.Empty;
-    private DateTime? _startDate = null;
-    private string _startTime = string.Empty;
-    private DateTime? _endDate = null;
-    private string _endTime = string.Empty;
-    private string _retentionHistory = string.Empty;
-    private DateTime? _nextDate = null;
-    private string _nextTime = string.Empty;
-    private string createdby;
-    private DateTime createdon;
-    private string modifiedby;
-    private DateTime modifiedon;
+	private ElementReference form;
+	private bool validated = false;
+	private int _jobId;
+	private string _name = string.Empty;
+	private string _jobType = string.Empty;
+	private string _isEnabled = "True";
+	private string _interval = string.Empty;
+	private string _frequency = string.Empty;
+	private DateTime? _startDate = null;
+	private string _startTime = string.Empty;
+	private DateTime? _endDate = null;
+	private string _endTime = string.Empty;
+	private string _retentionHistory = string.Empty;
+	private DateTime? _nextDate = null;
+	private string _nextTime = string.Empty;
+	private string createdby;
+	private DateTime createdon;
+	private string modifiedby;
+	private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _jobId = Int32.Parse(PageState.QueryString["id"]);
-            Job job = await JobService.GetJobAsync(_jobId);
-            if (job != null)
-            {
-                _name = job.Name;
-                _jobType = job.JobType;
-                _isEnabled = job.IsEnabled.ToString();
-                _interval = job.Interval.ToString();
-                _frequency = job.Frequency;
-                _startDate = job.StartDate;
-                if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
-                {
-                    _startTime = job.StartDate.Value.ToString("HH:mm");
-                }
-                _endDate = job.EndDate;
-                if (job.EndDate != null && job.EndDate.Value.TimeOfDay.TotalSeconds != 0)
-                {
-                    _endTime = job.EndDate.Value.ToString("HH:mm");
-                }
-                _retentionHistory = job.RetentionHistory.ToString();
-                _nextDate = job.NextExecution;
-                if (job.NextExecution != null && job.NextExecution.Value.TimeOfDay.TotalSeconds != 0)
-                {
-                    _nextTime = job.NextExecution.Value.ToString("HH:mm");
-                }
-                createdby = job.CreatedBy;
-                createdon = job.CreatedOn;
-                modifiedby = job.ModifiedBy;
-                modifiedon = job.ModifiedOn;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
-            AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_jobId = Int32.Parse(PageState.QueryString["id"]);
+			Job job = await JobService.GetJobAsync(_jobId);
+			if (job != null)
+			{
+				_name = job.Name;
+				_jobType = job.JobType;
+				_isEnabled = job.IsEnabled.ToString();
+				_interval = job.Interval.ToString();
+				_frequency = job.Frequency;
+				_startDate = job.StartDate;
+				if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
+				{
+					_startTime = job.StartDate.Value.ToString("HH:mm");
+				}
+				_endDate = job.EndDate;
+				if (job.EndDate != null && job.EndDate.Value.TimeOfDay.TotalSeconds != 0)
+				{
+					_endTime = job.EndDate.Value.ToString("HH:mm");
+				}
+				_retentionHistory = job.RetentionHistory.ToString();
+				_nextDate = job.NextExecution;
+				if (job.NextExecution != null && job.NextExecution.Value.TimeOfDay.TotalSeconds != 0)
+				{
+					_nextTime = job.NextExecution.Value.ToString("HH:mm");
+				}
+				createdby = job.CreatedBy;
+				createdon = job.CreatedOn;
+				modifiedby = job.ModifiedBy;
+				modifiedon = job.ModifiedOn;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
+			AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveJob()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            var job = await JobService.GetJobAsync(_jobId);
-            job.Name = _name;
-            job.JobType = _jobType;
-            job.IsEnabled = Boolean.Parse(_isEnabled);
-            job.Frequency = _frequency;
-            job.Interval = int.Parse(_interval);
+	private async Task SaveJob()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			var job = await JobService.GetJobAsync(_jobId);
+			job.Name = _name;
+			job.JobType = _jobType;
+			job.IsEnabled = Boolean.Parse(_isEnabled);
+			job.Frequency = _frequency;
+			if (job.Frequency == "O") // once
+			{
+				job.Interval = 1;
+			}
+			else
+			{
+				job.Interval = int.Parse(_interval);
+			}
             job.StartDate = _startDate;
             if (job.StartDate != null)
             {
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index 1996d62b..ecc195e4 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -36,75 +36,75 @@ else
             <td>@context.NextExecution</td>
             <td>
                 @if (context.IsStarted)
-                    {
+                {
                     <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">@Localizer["Stop"]</button>
-                    }
-                    else
-                    {
+                }
+                else
+                {
                     <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">@Localizer["Start"]</button>
-                    }
+                }
             </td>
         </Row>
     </Pager>
 }
 
 @code {
-    private List<Job> _jobs;
+	private List<Job> _jobs;
 
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+	public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-    protected override async Task OnParametersSetAsync()
-    {
-        _jobs = await JobService.GetJobsAsync();
-    }
+	protected override async Task OnParametersSetAsync()
+	{
+		_jobs = await JobService.GetJobsAsync();
+	}
 
-    private string DisplayStatus(bool isEnabled, bool isExecuting)
-    {
-        var status = string.Empty;
-        if (!isEnabled)
-        {
-            status = Localizer["Disabled"];
-        }
-        else
-        {
-            if (isExecuting)
-            {
-                status = Localizer["Executing"];
-            }
-            else
-            {
-                status = Localizer["Idle"];
-            }
-        }
+	private string DisplayStatus(bool isEnabled, bool isExecuting)
+	{
+		var status = string.Empty;
+		if (!isEnabled)
+		{
+			status = Localizer["Disabled"];
+		}
+		else
+		{
+			if (isExecuting)
+			{
+				status = Localizer["Executing"];
+			}
+			else
+			{
+				status = Localizer["Idle"];
+			}
+		}
 
-        return status;
-    }
+		return status;
+	}
 
 
-    private string DisplayFrequency(int interval, string frequency)
-    {
-        var result = $"{Localizer["Every"]} {interval.ToString()} ";
-        switch (frequency)
-        {
-            case "m":
-                result += Localizer["Minute"];
-                break;
-            case "H":
-                result += Localizer["Hour"];
-                break;
-            case "d":
-                result += Localizer["Day"];
-                break;
-            case "M":
-                result += Localizer["Month"];
-                break;
-        }
-
-        if (interval > 1)
-        {
-            result += Localizer["s"];
-        }
-
+	private string DisplayFrequency(int interval, string frequency)
+	{
+		var result = "";
+		switch (frequency)
+		{
+			case "m":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Minute"];
+				break;
+			case "H":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Hour"];
+				break;
+			case "d":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Day"];
+				break;
+			case "w":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Week"];
+				break;
+			case "M":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Month"];
+				break;
+			case "O":
+				result = Localizer["Once"];
+				break;
+		}
         return result;
     }
 
@@ -114,6 +114,7 @@ else
         {
             await JobService.DeleteJobAsync(job.JobId);
             await logger.LogInformation("Job Deleted {Job}", job);
+			_jobs = await JobService.GetJobsAsync();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -125,12 +126,36 @@ else
 
     private async Task StartJob(int jobId)
     {
-        await JobService.StartJobAsync(jobId);
+        try
+        {
+			await JobService.StartJobAsync(jobId);
+            await logger.LogInformation("Job Started {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Start"], MessageType.Error);
+        }
     }
 
     private async Task StopJob(int jobId)
     {
-        await JobService.StopJobAsync(jobId);
+        try
+        {
+			await JobService.StopJobAsync(jobId);
+            await logger.LogInformation("Job Stopped {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Stop"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Stopping Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Stop"], MessageType.Error);
+        }
     }
 
     private async Task Refresh()
diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 07fafe07..2bd43685 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -177,17 +177,17 @@
             {
                 await UserService.ForgotPasswordAsync(user);
                 await logger.LogInformation(LogFunction.Security, "Password Reset Notification Sent For Username {Username}", _username);
-                _message = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification";
+                _message = Localizer["Message.ForgotUser"];
             }
             else
             {
-                _message = "User Does Not Exist";
+                _message = Localizer["Message.UserDoesNotExist"];
                 _type = MessageType.Warning;
             }
         }
         else
         {
-            _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again";
+            _message = Localizer["Message.ForgotPassword"];
         }
 
         StateHasChanged();
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 311e73b0..853409cb 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -10,66 +11,83 @@
 }
 else
 {
-    <div class="container g-0">
-        <div class="row mb-1 align-items-center">
-            <div class="col-sm-4">
-                <Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
-                <select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
-                    <option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
-                    <option value="Trace">@Localizer["Trace"]</option>
-                    <option value="Debug">@Localizer["Debug"]</option>
-                    <option value="Information">@Localizer["Information"]</option>
-                    <option value="Warning">@Localizer["Warning"]</option>
-                    <option value="Error">@Localizer["Error"]</option>
-                    <option value="Critical">@Localizer["Critical"]</option>
-                </select>
-            </div>            
-            <div class="col-sm-4">
-                <Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
-                <select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
-                    <option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
-                    <option value="Create">@Localizer["Create"]</option>
-                    <option value="Read">@Localizer["Read"]</option>
-                    <option value="Update">@SharedLocalizer["Update"]</option>
-                    <option value="Delete">@SharedLocalizer["Delete"]</option>
-                    <option value="Security">@Localizer["Security"]</option>
-                    <option value="Other">@Localizer["Other"]</option>
-                </select>
-            </div>            
-            <div class="col-sm-4">
-                <Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
-                <select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
-                    <option value="10">10</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                </select>
-            </div>
-        </div>
-    </div>
+    <TabStrip>
+        <TabPanel Name="Events" Heading="Events" ResourceKey="Events">
+			<div class="container g-0">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-4">
+						<Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
+						<select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
+							<option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
+							<option value="Trace">@Localizer["Trace"]</option>
+							<option value="Debug">@Localizer["Debug"]</option>
+							<option value="Information">@Localizer["Information"]</option>
+							<option value="Warning">@Localizer["Warning"]</option>
+							<option value="Error">@Localizer["Error"]</option>
+							<option value="Critical">@Localizer["Critical"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
+						<select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
+							<option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
+							<option value="Create">@Localizer["Create"]</option>
+							<option value="Read">@Localizer["Read"]</option>
+							<option value="Update">@SharedLocalizer["Update"]</option>
+							<option value="Delete">@SharedLocalizer["Delete"]</option>
+							<option value="Security">@Localizer["Security"]</option>
+							<option value="Other">@Localizer["Other"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
+						<select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
+							<option value="10">10</option>
+							<option value="50">50</option>
+							<option value="100">100</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br />
 
-    @if (_logs.Any())
-    {
-        <Pager Items="@_logs">
-            <Header>
-				<th style="width: 1px;">&nbsp;</th>
-				<th>@Localizer["Date"]</th>
-				<th>@Localizer["Level"]</th>
-				<th>@Localizer["Feature"]</th>
-				<th>@Localizer["Function"]</th>
-            </Header>
-            <Row>
-                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
-                <td class="@GetClass(context.Function)">@context.LogDate</td>
-                <td class="@GetClass(context.Function)">@context.Level</td>
-                <td class="@GetClass(context.Function)">@context.Feature</td>
-                <td class="@GetClass(context.Function)">@context.Function</td>
-            </Row>
-        </Pager>
-    }
-    else
-    {
-        <p><em>@Localizer["NoLogs"]</em></p>
-    }
+			@if (_logs.Any())
+			{
+				<Pager Items="@_logs">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@Localizer["Date"]</th>
+						<th>@Localizer["Level"]</th>
+						<th>@Localizer["Feature"]</th>
+						<th>@Localizer["Function"]</th>
+					</Header>
+					<Row>
+						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
+						<td class="@GetClass(context.Function)">@context.LogDate</td>
+						<td class="@GetClass(context.Function)">@context.Level</td>
+						<td class="@GetClass(context.Function)">@context.Feature</td>
+						<td class="@GetClass(context.Function)">@context.Function</td>
+					</Row>
+				</Pager>
+			}
+			else
+			{
+				<p><em>@Localizer["NoLogs"]</em></p>
+			}
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of events to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
 }
 
 @code {
@@ -77,6 +95,7 @@ else
     private string _function = "-";
     private string _rows = "10";
     private List<Log> _logs;
+    private string _retention = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -85,6 +104,7 @@ else
         try
         {
             await GetLogs();
+			_retention = SettingService.GetSetting(PageState.Site.Settings, "LogRetention", "30");
         }
         catch (Exception ex)
         {
@@ -170,4 +190,22 @@ else
         }
         return classname;
     }
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			settings = SettingService.SetSetting(settings, "LogRetention", _retention, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+
 }
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
index 27f32ea7..d81480b5 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
@@ -128,7 +128,7 @@ else
                 var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
                 moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
 
-                var settings = ModuleState.Settings;
+				var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
                 SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
                 await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
 
diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor
index 545a573d..00eac54d 100644
--- a/Oqtane.Client/Modules/Admin/Reset/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor
@@ -7,41 +7,49 @@
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
-        <div class="form-group">
-            <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
-            <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="username" HelpText="Your username will be populated from the link you received in the password reset notification" ResourceKey="Username">Username: </Label>
+            <div class="col-sm-9">
+                <input id="username" type="text" class="form-control" @bind="@_username" readonly />
+            </div>
         </div>
-        <div class="form-group">
-            <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" required />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="password" HelpText="The new password. It must satisfy complexity rules for the site." ResourceKey="Password">Password: </Label>
+            <div class="col-sm-9">
+                <input id="password" type="password" class="form-control" @bind="@_password" required />
+            </div>
         </div>
-        <div class="form-group">
-            <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" required />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="confirm" HelpText="Enter the password again. It must exactly match the password entered above." ResourceKey="Confirm">Confirm: </Label>
+            <div class="col-sm-9">
+                <input id="confirm" type="password" class="form-control" @bind="@_confirm" required />
+            </div>
         </div>
-        <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
-        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
     </div>
+    <br />
+    <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 </form>
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private string _confirm = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private string _username = string.Empty;
+	private string _password = string.Empty;
+	private string _confirm = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    protected override void OnInitialized()
-    {
-        if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
+	protected override async Task OnInitializedAsync()
+	{
+		if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
         {
             _username = PageState.QueryString["name"];
         }
         else
         {
-            NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+            await logger.LogError(LogFunction.Security, "Invalid Attempt To Access User Password Reset");
+            NavigationManager.NavigateTo(NavigateUrl("")); // home page
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index ebe7548f..63f22032 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Site
 @inherits ModuleBase
+@using System.Text.RegularExpressions
 @inject NavigationManager NavigationManager
 @inject ISiteService SiteService
 @inject ITenantService TenantService
@@ -22,81 +23,64 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+                <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
                 <div class="col-sm-9">
-                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
-                    }
-                    else
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" readonly></textarea>
-                    }
+                    <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label>
+                <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
                 <div class="col-sm-9">
-                    <select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
-                        <option value="True">@SharedLocalizer["Yes"]</option>
-                        <option value="False">@SharedLocalizer["No"]</option>
+                    <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
+                        @foreach (var theme in _themes)
+                        {
+                            <option value="@theme.TypeName">@theme.Name</option>
+                        }
                     </select>
                 </div>
             </div>
-        </div>
-        <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
-            <div class="container">
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
-                    <div class="col-sm-9">
-                        <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
-                    <div class="col-sm-9">
-                        <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
-                    <div class="col-sm-9">
-                        <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
-                            <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
-                            @foreach (var theme in _themes)
-                            {
-                                <option value="@theme.TypeName">@theme.Name</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
-                    <div class="col-sm-9">
-                        <select id="defaultContainer" class="form-select" @bind="@_containertype" required>
-                            <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                            @foreach (var container in _containers)
-                            {
-                                <option value="@container.TypeName">@container.Name</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
-                    <div class="col-sm-9">
-                        <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
-                            <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                            <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
-                            @foreach (var container in _containers)
-                            {
-                                <option value="@container.TypeName">@container.Name</option>
-                            }
-                        </select>
-                    </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultContainer" class="form-select" @bind="@_containertype" required>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        @foreach (var container in _containers)
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
+                    </select>
                 </div>
             </div>
-        </Section>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
+                        @foreach (var container in _containers)
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
+				<div class="col-sm-9">
+					<select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
+						<option value="True">@SharedLocalizer["Yes"]</option>
+						<option value="False">@SharedLocalizer["No"]</option>
+					</select>
+				</div>
+			</div>
+		</div>
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -174,8 +158,29 @@
                 </div>
             </div>
         </Section>
-        @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        @if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
+			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
+                <div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+						<div class="col-sm-9">
+							<textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="defaultalias" HelpText="The default alias for the site. Requests for non-default aliases will be redirected to the default alias." ResourceKey="DefaultAlias">Default Alias: </Label>
+						<div class="col-sm-9">
+                            <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+								@foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+								{
+									<option value="@name">@name</option>
+								}
+                            </select>
+						</div>
+					</div>
+				</div>
+			</Section>
             <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -238,7 +243,8 @@
 	private List<ThemeControl> _themes = new List<ThemeControl>();
 	private List<ThemeControl> _containers = new List<ThemeControl>();
 	private string _name = string.Empty;
-	private List<Alias> _aliasList;
+	private List<Alias> _aliases;
+	private string _defaultalias = string.Empty;
 	private string _urls = string.Empty;
 	private string _runtime = "";
 	private string _prerender = "";
@@ -288,13 +294,7 @@
 
 				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 				{
-					_aliasList = await AliasService.GetAliasesAsync();
-					foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-					{
-						_urls += alias.Name + ",";
-					}
-					_urls = _urls.Substring(0, _urls.Length - 1);
-
+					await GetAliases();
 				}
 
 				if (site.LogoFileId != null)
@@ -322,7 +322,7 @@
 				{
 					_pwasplashiconfileid = site.PwaSplashIconFileId.Value;
 				}
-				
+
 				var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
 				_smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
 				_smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
@@ -398,13 +398,17 @@
 					var unique = true;
 					if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
 					{
-						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+						_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
+						var aliases = await AliasService.GetAliasesAsync();
+						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
 						{
-							if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
+							var alias = aliases.Where(item => item.Name == name).FirstOrDefault();
+							if (alias != null && unique)
 							{
-								unique = false;
+								unique = (alias.TenantId == PageState.Site.TenantId && alias.SiteId == PageState.Site.SiteId);
 							}
 						}
+						if (unique && string.IsNullOrEmpty(_defaultalias)) unique = false;
 					}
 
 					if (unique)
@@ -422,7 +426,6 @@
 								{
 									site.Runtime = _runtime;
 									site.RenderMode = _runtime + _prerender;
-									refresh = true;
 									reload = true; // needs to be reloaded on server
 								}
 							}
@@ -461,145 +464,173 @@
 							int? pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
 							if (pwaappiconfileid == -1) pwaappiconfileid = null;
 							if (site.PwaAppIconFileId != pwaappiconfileid)
-                            {
-                                site.PwaAppIconFileId = pwaappiconfileid;
+							{
+								site.PwaAppIconFileId = pwaappiconfileid;
 								reload = true; // needs to be reloaded on server
-                            }
-                            int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
+							}
+							int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
 							if (pwasplashiconfileid == -1) pwasplashiconfileid = null;
-                            if (site.PwaSplashIconFileId != pwasplashiconfileid)
-                            {
-                                site.PwaSplashIconFileId = pwasplashiconfileid;
+							if (site.PwaSplashIconFileId != pwasplashiconfileid)
+							{
+								site.PwaSplashIconFileId = pwasplashiconfileid;
 								reload = true; // needs to be reloaded on server
-                            }
+							}
 
-                            site = await SiteService.UpdateSiteAsync(site);
+							site = await SiteService.UpdateSiteAsync(site);
 
-                            var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-                            SettingService.SetSetting(settings, "SMTPHost", _smtphost);
-                            SettingService.SetSetting(settings, "SMTPPort", _smtpport);
-                            SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
-                            SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
-                            SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
-                            SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
-                            await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+							var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+							SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+							SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+							SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+							SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+							SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+							SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+							await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
-                            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                            {
-                                var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                                foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                                {
-                                    if (!names.Contains(alias.Name))
-                                    {
-                                        await AliasService.DeleteAliasAsync(alias.AliasId);
-                                    }
-                                }
+							if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+							{
+								var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+									.Select(sValue => sValue.Trim()).ToArray();
+								foreach (Alias alias in _aliases)
+								{
+									if (!names.Contains(alias.Name.Trim()))
+									{
+										await AliasService.DeleteAliasAsync(alias.AliasId);
+									}
+								}
 
-                                foreach (string name in names)
-                                {
-                                    if (!_aliasList.Exists(item => item.Name == name))
-                                    {
-                                        Alias alias = new Alias();
-                                        alias.Name = name;
-                                        alias.TenantId = site.TenantId;
-                                        alias.SiteId = site.SiteId;
-                                        await AliasService.AddAliasAsync(alias);
-                                    }
-                                }
-                            }
+								foreach (string name in names)
+								{
+									var alias = _aliases.Find(item => item.Name.Trim() == name);
+									if (alias == null)
+									{
+										alias = new Alias();
+										alias.Name = name;
+										alias.TenantId = site.TenantId;
+										alias.SiteId = site.SiteId;
+										alias.IsDefault = (name == _defaultalias);
+										await AliasService.AddAliasAsync(alias);
+									}
+									else
+									{
+										if (alias.Name != name || alias.IsDefault != (alias.Name.Trim() == _defaultalias))
+										{
+											alias.Name = name;
+											alias.IsDefault = (name == _defaultalias);
+											await AliasService.UpdateAliasAsync(alias);
+										}
+									}
+								}
+								await GetAliases();
+							}
 
-                            await logger.LogInformation("Site Settings Saved {Site}", site);
+							await logger.LogInformation("Site Settings Saved {Site}", site);
 
-                            if (refresh)
-                            {
-                                NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
-                            }
-                            else
-                            {
-                                AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
-                    }
-                }
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
-        }
-    }
+							if (refresh || reload)
+							{
+								NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
+							}
+							else
+							{
+								AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
+								await interop.ScrollTo(0, 0, "smooth");
+							}
+						}
+					}
+					else // deuplicate alias or default alias not specified
+					{
+						AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
+					}
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
+				}
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+				AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+		}
+	}
 
-    private async Task DeleteSite()
-    {
-        try
-        {
-            var sites = await SiteService.GetSitesAsync();
-            if (sites.Count > 1)
-            {
-                await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
-                await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
+	private async Task DeleteSite()
+	{
+		try
+		{
+			var sites = await SiteService.GetSitesAsync();
+			if (sites.Count > 1)
+			{
+				await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
+				await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
 
-                var aliases = await AliasService.GetAliasesAsync();
-                foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
-                {
-                    await AliasService.DeleteAliasAsync(a.AliasId);
-                }
+				var aliases = await AliasService.GetAliasesAsync();
+				foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
+				{
+					await AliasService.DeleteAliasAsync(a.AliasId);
+				}
 
-                NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-            AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
-        }
-    }
+				NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+			AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
+		}
+	}
 
-    private async Task SendEmail()
-    {
-        if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
-        {
-            try
-            {
-                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                SettingService.SetSetting(settings, "SMTPHost", _smtphost);
-                SettingService.SetSetting(settings, "SMTPPort", _smtpport);
-                SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
-                SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
-                SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
-                SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
-                await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
-                await logger.LogInformation("Site SMTP Settings Saved");
+	private async Task SendEmail()
+	{
+		if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
+		{
+			try
+			{
+				var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+				SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+				SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+				SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+				SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+				SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+				SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+				await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+				await logger.LogInformation("Site SMTP Settings Saved");
 
-                await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User.DisplayName, PageState.User.Email, PageState.User.DisplayName, PageState.User.Email, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
-                AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Testing SMTP Configuration");
-                AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
-        }
-    }
+				await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User.DisplayName, PageState.User.Email, PageState.User.DisplayName, PageState.User.Email, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
+				AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Testing SMTP Configuration");
+				AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
+		}
+	}
+
+	private async Task GetAliases()
+	{
+		_urls = string.Empty;
+		_defaultalias = string.Empty;
+		_aliases = await AliasService.GetAliasesAsync();
+		_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+		foreach (Alias alias in _aliases)
+		{
+			_urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
+			if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias)) _defaultalias = alias.Name.Trim();
+		}
+		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
+	}
 }
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index cdcef8da..14cbc5f0 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Sites
 @using Oqtane.Interfaces
+@using System.Text.RegularExpressions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
@@ -282,6 +283,7 @@ else
         {
             if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
             {
+				_urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
                 var duplicates = new List<string>();
                 var aliases = await AliasService.GetAliasesAsync();
                 foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
@@ -370,8 +372,7 @@ else
                         if (installation.Success)
                         {
                             var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
-                            var uri = new Uri(NavigationManager.Uri);
-                            NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
+                            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
                         }
                         else
                         {
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index 09d7946d..4ece6608 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -30,20 +30,16 @@ else
 
 @code {
     private List<Alias> _sites;
-    private string _scheme;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
-        var uri = new Uri(NavigationManager.Uri);
-        _scheme = uri.Scheme + "://";
-
         var aliases = await AliasService.GetAliasesAsync();
         _sites = new List<Alias>();
         foreach (Alias alias in aliases)
         {
-            if (!_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
+            if (alias.IsDefault && !_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
             {
                 _sites.Add(alias);
             }
@@ -52,16 +48,11 @@ else
 
     private void Edit(string name)
     {
-        if (name.Equals("*"))
-        {
-            var uri = new Uri(NavigationManager.Uri);
-            name = uri.Authority;
-        }
-        NavigationManager.NavigateTo(_scheme + name + "/admin/site/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
     }
 
     private void Browse(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor
index b22d279e..db41daaa 100644
--- a/Oqtane.Client/Modules/Admin/Sql/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor
@@ -57,22 +57,20 @@ else
     {
         @if (_results.Count > 0)
         {
-            <div class="table-responsive">
-                <Pager Class="table table-bordered" Items="@_results">
-                    <Header>
-                        @foreach (KeyValuePair<string, string> kvp in _results.First())
-                        {
-                            <th>@kvp.Key</th>
-                        }
-                    </Header>
-                    <Row>
-                        @foreach (KeyValuePair<string, string> kvp in context)
-                        {
-                            <td>@kvp.Value</td>
-                        }
-                    </Row>
-                </Pager>
-            </div>
+            <Pager Class="table table-bordered" Items="@_results">
+                <Header>
+                    @foreach (KeyValuePair<string, string> kvp in _results.First())
+                    {
+                        <th>@kvp.Key</th>
+                    }
+                </Header>
+                <Row>
+                    @foreach (KeyValuePair<string, string> kvp in context)
+                    {
+                        <td>@kvp.Value</td>
+                    }
+                </Row>
+            </Pager>
         }
         else
         {
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index f28731dc..ef09cd2a 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -33,7 +33,7 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
+                <Label Class="col-sm-3" For="servertime" HelpText="Server Date/Time (in UTC)" ResourceKey="ServerTime">Server Date/Time: </Label>
                 <div class="col-sm-9">
                     <input id="servertime" class="form-control" @bind="@_servertime" readonly />
                 </div>
@@ -99,32 +99,32 @@
 </TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private string _version = string.Empty;
-    private string _clrversion = string.Empty;
-    private string _osversion = string.Empty;
-    private string _serverpath = string.Empty;
-    private string _servertime = string.Empty;
-    private string _installationid = string.Empty;
+	private string _version = string.Empty;
+	private string _clrversion = string.Empty;
+	private string _osversion = string.Empty;
+	private string _serverpath = string.Empty;
+	private string _servertime = string.Empty;
+	private string _installationid = string.Empty;
 
-    private string _detailederrors = string.Empty;
-    private string _logginglevel = string.Empty;
-    private string _swagger = string.Empty;
-    private string _packageservice = string.Empty;
+	private string _detailederrors = string.Empty;
+	private string _logginglevel = string.Empty;
+	private string _swagger = string.Empty;
+	private string _packageservice = string.Empty;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _version = Constants.Version;
+	protected override async Task OnInitializedAsync()
+	{
+		_version = Constants.Version;
 
-        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
-        if (systeminfo != null)
-        {
-            _clrversion = systeminfo["clrversion"];
-            _osversion = systeminfo["osversion"];
-            _serverpath = systeminfo["serverpath"];
-            _servertime = systeminfo["servertime"];
-            _installationid = systeminfo["installationid"];
+		Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
+		if (systeminfo != null)
+		{
+			_clrversion = systeminfo["clrversion"];
+			_osversion = systeminfo["osversion"];
+			_serverpath = systeminfo["serverpath"];
+			_servertime = systeminfo["servertime"] + " UTC";
+			_installationid = systeminfo["installationid"];
 
             _detailederrors = systeminfo["detailederrors"];
             _logginglevel = systeminfo["logginglevel"];
diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
index efde8b66..e57ad13e 100644
--- a/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
+++ b/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
@@ -40,28 +40,46 @@
 		var interop = new Interop(JSRuntime);
 		if (await interop.FormValid(form))
 		{
-			var route = new Route(_url, PageState.Alias.Path);
-			var url = route.SiteUrl + "/" + route.PagePath;
+			if (_url != _mappedurl)
+			{
+				var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+				url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
-			var urlmapping = new UrlMapping();
-			urlmapping.SiteId = PageState.Site.SiteId;
-			urlmapping.Url = url;
-			urlmapping.MappedUrl = _mappedurl;
-			urlmapping.Requests = 0;
-			urlmapping.CreatedOn = DateTime.UtcNow;
-			urlmapping.RequestedOn = DateTime.UtcNow;
+				_url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
+				_url = (!_url.StartsWith("http")) ? url + _url : _url;
 
-            try
-            {
-                urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
-                await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
-            }
+				if (_url.StartsWith(url))
+				{
+					var urlmapping = new UrlMapping();
+					urlmapping.SiteId = PageState.Site.SiteId;
+					var route = new Route(_url, PageState.Alias.Path);
+					urlmapping.Url = route.PagePath;
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping.Requests = 0;
+					urlmapping.CreatedOn = DateTime.UtcNow;
+					urlmapping.RequestedOn = DateTime.UtcNow;
+
+					try
+					{
+						urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
+						await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+						NavigationManager.NavigateTo(NavigateUrl());
+					}
+					catch (Exception ex)
+					{
+						await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
+						AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+					}
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
+				}
+			}
+			else
+			{
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+			}
         }
         else
         {
diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
index 1ef1b79a..10c9a57f 100644
--- a/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
@@ -26,55 +26,64 @@
 </form>
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
+	private ElementReference form;
+	private bool validated = false;
 
-    private int _urlmappingid;
-    private string _url = string.Empty;
-    private string _mappedurl = string.Empty;
+	private int _urlmappingid;
+	private string _url = string.Empty;
+	private string _mappedurl = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _urlmappingid = Int32.Parse(PageState.QueryString["id"]);
-            var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
-            if (urlmapping != null)
-            {
-                _url = urlmapping.Url;
-                _mappedurl = urlmapping.MappedUrl;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
-            AddModuleMessage(Localizer["Error.LoadUrlMapping"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_urlmappingid = Int32.Parse(PageState.QueryString["id"]);
+			var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+			if (urlmapping != null)
+			{
+				_url = urlmapping.Url;
+				_mappedurl = urlmapping.MappedUrl;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+			AddModuleMessage(Localizer["Error.LoadUrlMapping"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveUrlMapping()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
-            urlmapping.MappedUrl = _mappedurl;
+	private async Task SaveUrlMapping()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			if (_url != _mappedurl)
+			{
+				try
+				{
+					var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
-            try
-            {
-                urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
-                await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
-            }
-        }
+					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
+					await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+					NavigationManager.NavigateTo(NavigateUrl());
+				}
+				catch (Exception ex)
+				{
+					await logger.LogError(ex, "Error Saving UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+					AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+				}
+			}
+			else
+			{
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+			}
+		}
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor
index 327f7a37..28478589 100644
--- a/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor
@@ -40,10 +40,10 @@ else
 					<td><ActionLink Action="Edit" Parameters="@($"id=" + context.UrlMappingId.ToString())" ResourceKey="Edit" /></td>
 					<td><ActionDialog Header="Delete Url Mapping" Message="@string.Format(Localizer["Confirm.DeleteUrlMapping"], context.Url)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUrlMapping(context))" ResourceKey="DeleteUrlMapping" /></td>
 					<td>
-						<a href="" onclick="@(() => BrowseUrl(context.Url))">@context.Url</a>
+						<a href="@Utilities.TenantUrl(PageState.Alias, context.Url)">@context.Url</a>
 						@if (_mapped)
 						{
-							@((MarkupString)"<br />&gt;&gt;&nbsp;")<a href="" onclick="@(() => BrowseUrl(context.MappedUrl))">@context.MappedUrl</a>
+							@((MarkupString)"<br />&gt;&gt;&nbsp;")<a href="@((context.MappedUrl.StartsWith("http") ? context.MappedUrl : Utilities.TenantUrl(PageState.Alias, context.MappedUrl)))">@context.MappedUrl</a>
 						}
 					</td>
 					<td>@context.Requests</td>
@@ -96,11 +96,6 @@ else
 		}
 	}
 
-	private void BrowseUrl(string url)
-	{
-		NavigationManager.NavigateTo(url, true);		
-	}
-
 	private async Task DeleteUrlMapping(UrlMapping urlMapping)
 	{
 		try
diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 5644482d..9f3d19ae 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -12,7 +12,7 @@
 
 @if (PageState.User != null && photo != null)
 {
-    <img src="@ImageUrl(photofileid, 400, 400, "crop")" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+    <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
 }
 else
 {
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 3f138c34..1649e56e 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -89,7 +89,7 @@ else
     {
         var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)));
 
-        if (string.IsNullOrEmpty(_search))
+        if (!string.IsNullOrEmpty(_search))
         {
             results = results.Where(item =>
                 (
diff --git a/Oqtane.Client/Modules/Admin/Visitors/Index.razor b/Oqtane.Client/Modules/Admin/Visitors/Index.razor
index d09d8e0d..a3f97ecd 100644
--- a/Oqtane.Client/Modules/Admin/Visitors/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Visitors/Index.razor
@@ -2,6 +2,7 @@
 @inherits ModuleBase
 @inject IVisitorService VisitorService
 @inject ISiteService SiteService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -56,18 +57,30 @@ else
 					<td>@context.CreatedOn</td>
 				</Row>
 			</Pager>
-	</TabPanel>
+		</TabPanel>
         <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
 			<div class="container">
 				<div class="row mb-1 align-items-center">
-					<Label Class="col-sm-3" For="visitortracking" HelpText="Specify if visitor tracking is enabled" ResourceKey="VisitorTracking">Visitor Tracking Enabled? </Label>
+					<Label Class="col-sm-3" For="tracking" HelpText="Specify if visitor tracking is enabled" ResourceKey="Tracking">Tracking Enabled? </Label>
 					<div class="col-sm-9">
-						<select id="visitortracking" class="form-select" @bind="@_visitortracking" >
+						<select id="tracking" class="form-select" @bind="@_tracking" >
 							<option value="True">@SharedLocalizer["Yes"]</option>
 							<option value="False">@SharedLocalizer["No"]</option>
 						</select>
 					</div>
 				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="filter" HelpText="Comma delimited list of terms which may exist in IP addresses, user agents, or languages which identify visitors which should not be tracked (ie. bots)" ResourceKey="Filter">Filter: </Label>
+					<div class="col-sm-9">
+						<textarea id="filter" class="form-control" @bind="@_filter" rows="3"></textarea>
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of visitor activity to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
 			</div>
 			<br />
 			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
@@ -79,14 +92,18 @@ else
 	private bool _users = false;
 	private int _days = 1;
 	private List<Visitor> _visitors;
-	private string _visitortracking;
+	private string _tracking;
+	private string _filter = "";
+	private string _retention = "";
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
 	protected override async Task OnParametersSetAsync()
 	{
 		await GetVisitors();
-		_visitortracking = PageState.Site.VisitorTracking.ToString();
+		_tracking = PageState.Site.VisitorTracking.ToString();
+		_filter = SettingService.GetSetting(PageState.Site.Settings, "VisitorFilter", "");
+		_retention = SettingService.GetSetting(PageState.Site.Settings, "VisitorRetention", "30");
 	}
 
 	private async void TypeChanged(ChangeEventArgs e)
@@ -124,15 +141,21 @@ else
 		{
 			_visitors = _visitors.Where(item => item.UserId != null).ToList();
 		}
-    }
+	}
 
 	private async Task SaveSiteSettings()
 	{
 		try
 		{
 			var site = PageState.Site;
-			site.VisitorTracking = bool.Parse(_visitortracking);
+			site.VisitorTracking = bool.Parse(_tracking);
 			await SiteService.UpdateSiteAsync(site);
+
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			settings = SettingService.SetSetting(settings, "VisitorFilter", _filter, true);
+			settings = SettingService.SetSetting(settings, "VisitorRetention", _retention, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
 			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
 		}
 		catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Controls/Label.razor b/Oqtane.Client/Modules/Controls/Label.razor
index 4362147d..a1f8bf3f 100644
--- a/Oqtane.Client/Modules/Controls/Label.razor
+++ b/Oqtane.Client/Modules/Controls/Label.razor
@@ -25,8 +25,8 @@ else
     [Parameter]
     public string HelpText { get; set; } // optional - tooltip for this label
 
-    private string _spanclass = "app-tooltip";
-    private string _labelclass = "form-label";
+    private string _spanclass;
+    private string _labelclass;
     private string _helptext = string.Empty;
 
     protected override void OnParametersSet()
@@ -36,11 +36,15 @@ else
         if (!string.IsNullOrEmpty(HelpText))
         {
             _helptext = Localize(nameof(HelpText), HelpText);
-            _spanclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label";
+
+            var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _spanclass = "app-tooltip" + spanclass;
         }
         else
         {
-            _labelclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            var labelclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label" + labelclass;
         }
 
         var text = Localize("Text", String.Empty);
diff --git a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
index 773df857..711504c6 100644
--- a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
+++ b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
@@ -13,6 +13,9 @@ namespace Oqtane.Modules.Controls
         [Parameter]
         public string ResourceKey { get; set; }
 
+        [Parameter]
+        public string ResourceType { get; set; }
+
         protected bool IsLocalizable { get; private set; }
 
         protected string Localize(string name) => _localizer?[name] ?? name;
@@ -50,9 +53,14 @@ namespace Oqtane.Modules.Controls
         {
             IsLocalizable = false;
 
-            if (!String.IsNullOrEmpty(ResourceKey) && ModuleState?.ModuleType != null)
+            if (string.IsNullOrEmpty(ResourceType))
             {
-                var moduleType = Type.GetType(ModuleState.ModuleType);
+                ResourceType = ModuleState?.ModuleType;
+            }
+
+            if (!String.IsNullOrEmpty(ResourceKey) && !string.IsNullOrEmpty(ResourceType))
+            {
+                var moduleType = Type.GetType(ResourceType);
                 if (moduleType != null)
                 {
                     using (var scope = ServiceActivator.GetScope())
diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index 40dc54ca..99dbc1ca 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -54,21 +54,23 @@
     }
     @if (Format == "Table" && Row != null)
     {
-        <table class="@Class">
-            <thead>
-                <tr>@Header</tr>
-            </thead>
-            <tbody>
-                @foreach (var item in ItemList)
-                {
-                    <tr>@Row(item)</tr>
-                    @if (Detail != null)
-                    {
-                        <tr>@Detail(item)</tr>
-                    }
-                }
-            </tbody>
-        </table>
+		<div class="table-responsive">
+			<table class="@Class">
+				<thead>
+					<tr>@Header</tr>
+				</thead>
+				<tbody>
+					@foreach (var item in ItemList)
+					{
+						<tr>@Row(item)</tr>
+						@if (Detail != null)
+						{
+							<tr>@Detail(item)</tr>
+						}
+					}
+				</tbody>
+			</table>
+		</div>
     }
     @if (Format == "Grid" && Row != null)
     {
@@ -107,8 +109,8 @@
             <li class="page-item@((_page > 1) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
-            {
+            @if (_pages > _displayPages && _displayPages > 1)
+             {
                 <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
                 </li>
@@ -135,7 +137,7 @@
             <li class="page-item@((_page < _pages) ? "" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
-            @if (_pages > _displayPages)
+            @if (_pages > _displayPages && _displayPages > 1)
             {
                 <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
@@ -145,7 +147,7 @@
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
-                <a class="page-link">Page @_page of @_pages</a>
+               <a class="page-link" style="white-space: nowrap;">Page @_page of @_pages</a>
             </li>
         </ul>
     }
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 82afff0c..d926bbe0 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -120,19 +120,20 @@
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
     };
 
-    protected override void OnParametersSet()
+    protected override async Task OnParametersSetAsync()
     {
         _content = Content; // raw HTML
+        await RefreshRichText();
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-       var interop = new RichTextEditorInterop(JSRuntime);
-       
-       if (firstRender)
+        var interop = new RichTextEditorInterop(JSRuntime);
+        if (firstRender)
         {
             await base.OnAfterRenderAsync(firstRender);
 
+
             await interop.CreateEditor(
                 _editorElement,
                 _toolBar,
@@ -140,15 +141,14 @@
                 Placeholder,
                 Theme,
                 DebugLevel);
+
+            await interop.LoadEditorContent(_editorElement, Content);
+
+            _content = Content; // raw HTML
+
         }
-
-        await interop.LoadEditorContent(_editorElement, Content);
-
-        _content = Content; // raw HTML
-
-        // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
-        _original = await interop.GetHtml(_editorElement);
-
+            // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
+            _original = await interop.GetHtml(_editorElement);
     }
 
     public void CloseFileManager()
diff --git a/Oqtane.Client/Modules/HtmlText/Settings.razor b/Oqtane.Client/Modules/HtmlText/Settings.razor
index 8aab9c77..237049a6 100644
--- a/Oqtane.Client/Modules/HtmlText/Settings.razor
+++ b/Oqtane.Client/Modules/HtmlText/Settings.razor
@@ -5,44 +5,45 @@
 @inject IStringLocalizer<Settings> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <div class="container">
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="files" ResourceKey="Allow File Management" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-            <div class="col-sm-9">
-                <select id="files" class="form-select" @bind="@_allowfilemanagement">
-                    <option value="true">@SharedLocalizer["Yes"]</option>
-                    <option value="false">@SharedLocalizer["No"]</option>
-                </select>
-            </div>
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="files" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+        <div class="col-sm-9">
+            <select id="files" class="form-select" @bind="@_allowfilemanagement">
+                <option value="true">@SharedLocalizer["Yes"]</option>
+                <option value="false">@SharedLocalizer["No"]</option>
+            </select>
         </div>
     </div>
+</div>
 
-    @code {
-        private string _allowfilemanagement;
+@code {		
+	private string resourceType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client"; // for localization
+    private string _allowfilemanagement;
 
-        protected override void OnInitialized()
+    protected override void OnInitialized()
+    {
+        try
         {
-            try
-            {
-                _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
         }
-
-        public async Task UpdateSettings()
+        catch (Exception ex)
         {
-            try
-            {
-                var settings = ModuleState.Settings;
-                settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 30adc2a1..f3f06aee 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -134,14 +134,19 @@ namespace Oqtane.Modules
             return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
         }
 
-        public string ImageUrl(int fileid, int width, int height, string mode)
+        public string ImageUrl(int fileid, int width, int height)
         {
-            return ImageUrl(fileid, width, height, mode, 0);
+            return ImageUrl(fileid, width, height, "");
         }
 
-        public string ImageUrl(int fileid, int width, int height, string mode, int rotate)
+        public string ImageUrl(int fileid, int width, int height, string mode)
         {
-            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, rotate);
+            return ImageUrl(fileid, width, height, mode, "", "", 0, false);
+        }
+
+        public string ImageUrl(int fileid, int width, int height, string mode, string position, string background, int rotate, bool recreate)
+        {
+            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
 
         public virtual Dictionary<string, string> GetUrlParameters(string parametersTemplate = "")
diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index a2366502..761d52e6 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -13,7 +13,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
index eae2f962..facc630b 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Edit.resx
@@ -186,4 +186,10 @@
   <data name="NextExecution.Text" xml:space="preserve">
     <value>Next Execution: </value>
   </data>
+  <data name="Week(s)" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
index a3da62e9..db97ddc3 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx
@@ -133,19 +133,16 @@
     <value>Every</value>
   </data>
   <data name="Minute" xml:space="preserve">
-    <value>Minute</value>
+    <value>Minute(s)</value>
   </data>
   <data name="Hour" xml:space="preserve">
-    <value>Hour</value>
+    <value>Hour(s)</value>
   </data>
   <data name="Day" xml:space="preserve">
-    <value>Day</value>
+    <value>Day(s)</value>
   </data>
   <data name="Month" xml:space="preserve">
-    <value>Month</value>
-  </data>
-  <data name="s" xml:space="preserve">
-    <value>s</value>
+    <value>Month(s)</value>
   </data>
   <data name="Error.Job.Delete" xml:space="preserve">
     <value>Error Deleting Job</value>
@@ -177,4 +174,22 @@
   <data name="JobLog.Text" xml:space="preserve">
     <value>Log</value>
   </data>
+  <data name="Error.Job.Start" xml:space="preserve">
+    <value>An error occurred when starting the job</value>
+  </data>
+  <data name="Error.Job.Stop" xml:space="preserve">
+    <value>An error occurred when stopping the job</value>
+  </data>
+  <data name="Message.Job.Start" xml:space="preserve">
+    <value>The process responsible for executing this job has been started. The next execution will be based on the schedule criteria for the job.</value>
+  </data>
+  <data name="Message.Job.Stop" xml:space="preserve">
+    <value>The process responsible for executing this job has been stopped. In order to restart the process you will need to use the Start button or restart the application.</value>
+  </data>
+  <data name="Week" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Login/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Login/Index.resx
index feaa718f..36ae93c3 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Login/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Login/Index.resx
@@ -138,4 +138,13 @@
   <data name="Info.SignedIn" xml:space="preserve">
     <value>You Are Already Signed In</value>
   </data>
+  <data name="Message.ForgotPassword" xml:space="preserve">
+    <value>Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again</value>
+  </data>
+  <data name="Message.ForgotUser" xml:space="preserve">
+    <value>Please Check The Email Address Associated To Your User Account For A Password Reset Notification</value>
+  </data>
+  <data name="Message.UserDoesNotExist" xml:space="preserve">
+    <value>User Does Not Exist</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx
index 84d9994a..dfd55880 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Logs/Index.resx
@@ -192,4 +192,22 @@
   <data name="LogDetails.Text" xml:space="preserve">
     <value>Details</value>
   </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Events.Heading" xml:space="preserve">
+    <value>Events</value>
+  </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of events to retain</value>
+  </data>
+  <data name="Retention.Text" xml:space="preserve">
+    <value>Retention (Days):</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
index e6838ba4..ad6dfd25 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Edit.resx
@@ -258,9 +258,6 @@
   <data name="ThemeSettings.Heading" xml:space="preserve">
     <value>Theme Settings</value>
   </data>
-  <data name="Appearance.Hea" xml:space="preserve">
-    <value />
-  </data>
   <data name="Clickable.HelpText" xml:space="preserve">
     <value>Select whether the link in the site navigation is enabled or disabled</value>
   </data>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx
index 0922f6da..a1a3fcb0 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Reset/Index.resx
@@ -117,22 +117,37 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Password.Confirm" xml:space="preserve">
-    <value>Confirm Password:</value>
-  </data>
   <data name="Message.Password.NoMatch" xml:space="preserve">
     <value>Passwords Entered Do Not Match</value>
   </data>
   <data name="Message.Required.UserInfo" xml:space="preserve">
-    <value>You Must Provide A Username, Password, and Email Address</value>
+    <value>You Must Provide The Password And Confirmation</value>
   </data>
   <data name="Password.Reset" xml:space="preserve">
     <value>Reset Password</value>
   </data>
   <data name="Error.Password.ResetInfo" xml:space="preserve">
-    <value>Error Resetting User Password. Please Ensure Password Meets Complexity Requirements.</value>
+    <value>Error Resetting User Password. Please Ensure The Request To Reset Your Password Was Made Within The Past 24 Hours And The New Password Meets The Complexity Requirements.</value>
   </data>
   <data name="Error.Password.Reset" xml:space="preserve">
     <value>Error Resetting User Password</value>
   </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm:</value>
+  </data>
+  <data name="Conform.HelpText" xml:space="preserve">
+    <value>Enter the password again. It must exactly match the password entered above.</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>The new password. It must satisfy complexity rules for the site.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Your username will be populated from the link you received in the password reset notification</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index cefa464f..49c4d0e7 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -129,9 +129,6 @@
   <data name="DefaultContainer.Text" xml:space="preserve">
     <value>Default Container: </value>
   </data>
-  <data name="Appearance.Heading" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
   <data name="DefaultAdminContainer" xml:space="preserve">
     <value>Default Admin Container</value>
   </data>
@@ -145,7 +142,7 @@
     <value>Site Settings Saved</value>
   </data>
   <data name="Message.Aliases.Taken" xml:space="preserve">
-    <value>An Alias Specified Has Already Been Used For Another Site</value>
+    <value>The Default Alias Has Not Been Specified Or An Alias Was Specified That Has Already Been Used For Another Site</value>
   </data>
   <data name="Message.Required.SiteName" xml:space="preserve">
     <value>You Must Provide A Site Name, Alias, And Default Theme/Container</value>
@@ -223,7 +220,7 @@
     <value>Aliases: </value>
   </data>
   <data name="IsDeleted.Text" xml:space="preserve">
-    <value>Is Deleted? </value>
+    <value>Deleted? </value>
   </data>
   <data name="Logo.Text" xml:space="preserve">
     <value>Logo: </value>
@@ -318,4 +315,13 @@
   <data name="DeleteSite.Text" xml:space="preserve">
     <value>Delete Site</value>
   </data>
+  <data name="DefaultAlias.HelpText" xml:space="preserve">
+    <value>The default alias for the site. Requests for non-default aliases will be redirected to the default alias.</value>
+  </data>
+    <data name="DefaultAlias.Text" xml:space="preserve">
+    <value>Default Alias: </value>
+  </data>
+  <data name="Aliases.Heading" xml:space="preserve">
+    <value>Aliases</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
index 724b58dd..e564fcf8 100644
--- a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -133,7 +133,7 @@
     <value>Server Path</value>
   </data>
   <data name="ServerTime.HelpText" xml:space="preserve">
-    <value>Server Time</value>
+    <value>Server Date/Time (in UTC)</value>
   </data>
   <data name="FrameworkVersion.Text" xml:space="preserve">
     <value>Framework Version: </value>
@@ -148,7 +148,7 @@
     <value>Server Path: </value>
   </data>
   <data name="ServerTime.Text" xml:space="preserve">
-    <value>Server Time: </value>
+    <value>Server Date/Time: </value>
   </data>
   <data name="RestartApplication.Header" xml:space="preserve">
     <value>Restart Application</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx
index 6f983495..e1185498 100644
--- a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx
@@ -121,10 +121,10 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A fully qualified Url where the user will be redirected</value>
+    <value>A relative or absolute Url where the user will be redirected</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
-    <value>A fully qualified Url for this site</value>
+    <value>An absolute Url identifying a path to a specific page in the site</value>
   </data>
   <data name="Url.Text" xml:space="preserve">
     <value>Url:</value>
@@ -135,4 +135,10 @@
   <data name="Message.InfoRequired" xml:space="preserve">
     <value>Please Provide All Required Information</value>
   </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</value>
+  </data>
+  <data name="Message.SaveUrlMapping" xml:space="preserve">
+    <value>The Url must belong to the current site</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx
index 400ba0d5..2312ef83 100644
--- a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx
@@ -121,10 +121,10 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A fully qualified Url where the user will be redirected</value>
+    <value>A relative or absolute Url where the user will be redirected</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
-    <value>A fully qualified Url for this site</value>
+    <value>A relative Url identifying a path to a specific page in the site</value>
   </data>
   <data name="Url.Text" xml:space="preserve">
     <value>Url:</value>
@@ -138,4 +138,7 @@
   <data name="Message.InfoRequired" xml:space="preserve">
     <value>Please Provide All Required Information</value>
   </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx
index 7f305a74..a6e25bbc 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Visitors/Index.resx
@@ -156,11 +156,11 @@
   <data name="Visitors.Heading" xml:space="preserve">
     <value>Visitors</value>
   </data>
-  <data name="VisitorTracking.HelpText" xml:space="preserve">
+  <data name="Tracking.HelpText" xml:space="preserve">
     <value>Specify if visitor tracking is enabled</value>
   </data>
-  <data name="VisitorTracking.Text" xml:space="preserve">
-    <value>Visitor Tracking Enabled?</value>
+  <data name="Tracking.Text" xml:space="preserve">
+    <value>Tracking Enabled?</value>
   </data>
   <data name="IP" xml:space="preserve">
     <value>IP</value>
@@ -171,4 +171,19 @@
   <data name="Created" xml:space="preserve">
     <value>Created</value>
   </data>
+  <data name="Details.Text" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="Filter.HelpText" xml:space="preserve">
+    <value>Comma delimited list of terms which may exist in IP addresses, user agents, or languages which identify visitors which should not be tracked (ie. bots)</value>
+  </data>
+  <data name="Filter.Text" xml:space="preserve">
+    <value>Filter:</value>
+  </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of visitor activity to retain</value>
+  </data>
+  <data name="Retention.Text" xml:space="preserve">
+    <value>Retention (Days):</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx b/Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx
index f76bc983..913e111d 100644
--- a/Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx
+++ b/Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx
@@ -177,4 +177,13 @@
   <data name="System.Update" xml:space="preserve">
     <value>Check For System Updates</value>
   </data>
+  <data name="Visibility" xml:space="preserve">
+    <value>Visibility:</value>
+  </data>
+  <data name="VisibilityEdit" xml:space="preserve">
+    <value>Page Editors Only</value>
+  </data>
+  <data name="VisibilityView" xml:space="preserve">
+    <value>Same As Page</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Themes/OqtaneTheme/Containers/ContainerSettings.resx b/Oqtane.Client/Resources/Themes/OqtaneTheme/ContainerSettings.resx
similarity index 51%
rename from Oqtane.Client/Resources/Themes/OqtaneTheme/Containers/ContainerSettings.resx
rename to Oqtane.Client/Resources/Themes/OqtaneTheme/ContainerSettings.resx
index 4c05a1fb..1e4a939f 100644
--- a/Oqtane.Client/Resources/Themes/OqtaneTheme/Containers/ContainerSettings.resx
+++ b/Oqtane.Client/Resources/Themes/OqtaneTheme/ContainerSettings.resx
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
-            Microsoft ResX Schema 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
 
-            Version 2.0
-
-            The primary goals of this format is to allow a simple XML format 
-            that is mostly human readable. The generation and parsing of the 
-            various data types are done through the TypeConverter classes 
-            associated with the data types.
-
-            Example:
-
-            ... ado.net/XML headers & schema ...
-            <resheader name="resmimetype">text/microsoft-resx</resheader>
-            <resheader name="version">2.0</resheader>
-            <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-            <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-            <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-            <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-            <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-                <value>[base64 mime encoded serialized .NET Framework object]</value>
-            </data>
-            <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-                <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-                <comment>This is a comment</comment>
-            </data>
-
-            There are any number of "resheader" rows that contain simple 
-            name/value pairs.
-
-            Each data row contains a name, and value. The row also contains a 
-            type or mimetype. Type corresponds to a .NET class that support 
-            text/value conversion through the TypeConverter architecture. 
-            Classes that don't support this are serialized and stored with the 
-            mimetype set.
-
-            The mimetype is used for serialized objects, and tells the 
-            ResXResourceReader how to depersist the object. This is currently not 
-            extensible. For a given mimetype the value must be set accordingly:
-
-            Note - application/x-microsoft.net.object.binary.base64 is the format 
-            that the ResXResourceWriter will generate, however the reader can 
-            read any of the formats listed below.
-
-            mimetype: application/x-microsoft.net.object.binary.base64
-            value   : The object must be serialized with 
-                    : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-                    : and then encoded with base64 encoding.
-
-            mimetype: application/x-microsoft.net.object.soap.base64
-            value   : The object must be serialized with 
-                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-                    : and then encoded with base64 encoding.
-
-            mimetype: application/x-microsoft.net.object.bytearray.base64
-            value   : The object must be serialized into a byte array 
-                    : using a System.ComponentModel.TypeConverter
-                    : and then encoded with base64 encoding.
-            -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
diff --git a/Oqtane.Client/Resources/Themes/OqtaneTheme/Themes/ThemeSettings.resx b/Oqtane.Client/Resources/Themes/OqtaneTheme/ThemeSettings.resx
similarity index 99%
rename from Oqtane.Client/Resources/Themes/OqtaneTheme/Themes/ThemeSettings.resx
rename to Oqtane.Client/Resources/Themes/OqtaneTheme/ThemeSettings.resx
index 7d8c7c4d..7200f2dd 100644
--- a/Oqtane.Client/Resources/Themes/OqtaneTheme/Themes/ThemeSettings.resx
+++ b/Oqtane.Client/Resources/Themes/OqtaneTheme/ThemeSettings.resx
@@ -121,7 +121,7 @@
     <value>Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page.</value>
   </data>
   <data name="Footer.Text" xml:space="preserve">
-    <value>Display Footer?</value>
+    <value>Display Fixed Footer?</value>
   </data>
   <data name="Login.HelpText" xml:space="preserve">
     <value>Specify if a Login option should be displayed,  Note that this option does not prevent the login page from being accessible via a direct url.</value>
diff --git a/Oqtane.Client/Services/Interfaces/ISettingService.cs b/Oqtane.Client/Services/Interfaces/ISettingService.cs
index e02261f8..60099fd5 100644
--- a/Oqtane.Client/Services/Interfaces/ISettingService.cs
+++ b/Oqtane.Client/Services/Interfaces/ISettingService.cs
@@ -206,7 +206,7 @@ namespace Oqtane.Services
         /// <returns></returns>
         Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue);
 
-        Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPublic);
+        Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPrivate);
 
         Dictionary<string, string> MergeSettings(Dictionary<string, string> settings1, Dictionary<string, string> settings2);
 
diff --git a/Oqtane.Client/Services/Interfaces/IUrlMappingService.cs b/Oqtane.Client/Services/Interfaces/IUrlMappingService.cs
index 0a8ef940..6da0bf9d 100644
--- a/Oqtane.Client/Services/Interfaces/IUrlMappingService.cs
+++ b/Oqtane.Client/Services/Interfaces/IUrlMappingService.cs
@@ -24,6 +24,14 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<UrlMapping> GetUrlMappingAsync(int urlMappingId);
 
+        /// <summary>
+        /// Get one specific <see cref="UrlMapping"/>
+        /// </summary>
+        /// <param name="siteId">ID-reference of a <see cref="Site"/></param>
+        /// <param name="url">A url</param>
+        /// <returns></returns>
+        Task<UrlMapping> GetUrlMappingAsync(int siteId, string url);
+
         /// <summary>
         /// Add / save a new <see cref="UrlMapping"/> to the database.
         /// </summary>
diff --git a/Oqtane.Client/Services/SettingService.cs b/Oqtane.Client/Services/SettingService.cs
index 74cf3949..1c62a41c 100644
--- a/Oqtane.Client/Services/SettingService.cs
+++ b/Oqtane.Client/Services/SettingService.cs
@@ -131,14 +131,21 @@ namespace Oqtane.Services
             foreach (KeyValuePair<string, string> kvp in settings)
             {
                 string value = kvp.Value;
-                bool ispublic = false;
+                bool modified = false;
+                bool isprivate = false;
+
+                // manage settings modified with SetSetting method
+                if (value.StartsWith("[Private]"))
+                {
+                    modified = true;
+                    isprivate = true;
+                    value = value.Substring(9);                  
+                }
                 if (value.StartsWith("[Public]"))
                 {
-                    if (entityName == EntityNames.Site)
-                    {
-                        ispublic = true;
-                    }
-                    value = value.Substring(8); // remove [Public]
+                    modified = true;
+                    isprivate = false;
+                    value = value.Substring(8);                   
                 }
 
                 Setting setting = settingsList.FirstOrDefault(item => item.SettingName.Equals(kvp.Key, StringComparison.OrdinalIgnoreCase));
@@ -149,22 +156,21 @@ namespace Oqtane.Services
                     setting.EntityId = entityId;
                     setting.SettingName = kvp.Key;
                     setting.SettingValue = value;
-                    setting.IsPublic = ispublic;
+                    setting.IsPrivate = isprivate;
                     setting = await AddSettingAsync(setting);
                 }
                 else
                 {
-                    if (setting.SettingValue != kvp.Value)
+                    if (setting.SettingValue != value || (modified && setting.IsPrivate != isprivate))
                     {
                         setting.SettingValue = value;
-                        setting.IsPublic = ispublic;
+                        setting.IsPrivate = isprivate;
                         setting = await UpdateSettingAsync(setting);
                     }
                 }
             }
         }
 
-
         public async Task<Setting> GetSettingAsync(string entityName, int settingId)
         {
             return await GetJsonAsync<Setting>($"{Apiurl}/{settingId}/{entityName}");
@@ -201,13 +207,13 @@ namespace Oqtane.Services
             return SetSetting(settings, settingName, settingValue, false);
         }
 
-        public Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPublic)
+        public Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPrivate)
         {
             if (settings == null)
             {
                 settings = new Dictionary<string, string>();
             }
-            settingValue = (isPublic) ? "[Public]" + settingValue : settingValue;
+            settingValue = (isPrivate) ? "[Private]" + settingValue : "[Public]" + settingValue;
             if (settings.ContainsKey(settingName))
             {
                 settings[settingName] = settingValue;
diff --git a/Oqtane.Client/Services/UrlMappingService.cs b/Oqtane.Client/Services/UrlMappingService.cs
index 725149dc..121e818b 100644
--- a/Oqtane.Client/Services/UrlMappingService.cs
+++ b/Oqtane.Client/Services/UrlMappingService.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Collections.Generic;
 using Oqtane.Documentation;
 using Oqtane.Shared;
+using System.Net;
 
 namespace Oqtane.Services
 {
@@ -33,6 +34,11 @@ namespace Oqtane.Services
             return await GetJsonAsync<UrlMapping>($"{Apiurl}/{urlMappingId}");
         }
 
+        public async Task<UrlMapping> GetUrlMappingAsync(int siteId, string url)
+        {
+            return await GetJsonAsync<UrlMapping>($"{Apiurl}/url/{siteId}?url={WebUtility.UrlEncode(url)}");
+        }
+
         public async Task<UrlMapping> AddUrlMappingAsync(UrlMapping role)
         {
             return await PostJsonAsync<UrlMapping>(Apiurl, role);
diff --git a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
index 9ca3599e..15a6f398 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor
@@ -1,13 +1,20 @@
 @namespace Oqtane.Themes.BlazorTheme
 @inherits ContainerBase
 <div class="container">
-    <div class="row p-4">
-        <div class="d-flex flex-nowrap">
-            <ModuleActions /><h2><ModuleTitle /></h2>
-        </div>
-        <hr class="app-rule" />
-    </div>
-    <div class="row px-4">
+	@if (ModuleState.Title != "-")
+	{
+		<div class="row p-4">
+			<div class="d-flex flex-nowrap">
+				<ModuleActions /><h2><ModuleTitle /></h2>
+			</div>
+			<hr class="app-rule" />
+		</div>
+	}
+	else
+	{
+		<ModuleActions />
+	}
+	<div class="row px-4">
         <div class="container">
             <ModuleInstance />
         </div>
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
index 758a1bef..960b2dd4 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
@@ -46,360 +46,366 @@
 		</div>
 		<div class="@BodyClass">
 			<div class="container-fluid">
-			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
-			{
-				<div class="row d-flex">
-					<div class="col">
-						<button type="button" data-bs-dismiss="offcanvas" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
+				@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+				{
+					<div class="row d-flex">
+						<div class="col">
+							<button type="button" data-bs-dismiss="offcanvas" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
+						</div>
 					</div>
-				</div>
 
-				<hr class="app-rule" />
+					<hr class="app-rule" />
 
-				<div class="row">
-					<div class="col text-center">
-						<label class="control-label">@Localizer["Page.Manage"] </label>
+					<div class="row">
+						<div class="col text-center">
+							<label class="control-label">@Localizer["Page.Manage"] </label>
+						</div>
 					</div>
-				</div>
-				<div class="row d-flex">
-					<div class="col d-flex justify-content-between">
-						<button type="button" class="btn btn-secondary col me-1" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
-						<button type="button" class="btn btn-secondary col" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
-						<button type="button" class="btn btn-danger col ms-1" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
+					<div class="row d-flex mb-2">
+						<div class="col d-flex justify-content-between">
+							<button type="button" class="btn btn-secondary col me-1" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
+							<button type="button" class="btn btn-secondary col" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
+							<button type="button" class="btn btn-danger col ms-1" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
+						</div>
 					</div>
-				</div>
-				<br />
-				<div class="row d-flex">
-					<div class="col">
-						@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
-						{
-							<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
-						}
-						else
-						{
-							<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
-						}
+					<div class="row d-flex">
+						<div class="col">
+							@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
+							{
+								<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
+							}
+							else
+							{
+								<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
+							}
+						</div>
 					</div>
-				</div>
-			}
+				}
 
-			@if (_deleteConfirmation)
-			{
-				<div class="app-admin-modal">
-					<div class="modal" tabindex="-1" role="dialog">
-						<div class="modal-dialog">
-							<div class="modal-content">
-								<div class="modal-header">
-									<h5 class="modal-title">@Localizer["Page.Delete"]</h5>
-									<button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
-								</div>
-								<div class="modal-body">
-									<p>Are You Sure You Want To Delete This Page?</p>
-								</div>
-								<div class="modal-footer">
-									<button type="button" class="btn btn-danger" @onclick="DeletePage">@SharedLocalizer["Delete"]</button>
-									<button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@SharedLocalizer["Cancel"]</button>
+				@if (_deleteConfirmation)
+				{
+					<div class="app-admin-modal">
+						<div class="modal" tabindex="-1" role="dialog">
+							<div class="modal-dialog">
+								<div class="modal-content">
+									<div class="modal-header">
+										<h5 class="modal-title">@Localizer["Page.Delete"]</h5>
+										<button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
+									</div>
+									<div class="modal-body">
+										<p>Are You Sure You Want To Delete This Page?</p>
+									</div>
+									<div class="modal-footer">
+										<button type="button" class="btn btn-danger" @onclick="DeletePage">@SharedLocalizer["Delete"]</button>
+										<button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@SharedLocalizer["Cancel"]</button>
+									</div>
 								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-			}
-			<hr class="app-rule" />
-			<div class="row">
-				<div class="col text-center">
-					<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
-					<select class="form-select" @bind="@ModuleType">
-						<option value="new">@Localizer["Module.AddNew"]</option>
-						<option value="existing">@Localizer["Module.AddExisting"]</option>
-					</select>
-					@if (ModuleType == "new")
-					{
-						@if (_moduleDefinitions != null)
+				}
+				<hr class="app-rule" />
+				<div class="row">
+					<div class="col text-center">
+						<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
+						<select class="form-select" @bind="@ModuleType">
+							<option value="new">@Localizer["Module.AddNew"]</option>
+							<option value="existing">@Localizer["Module.AddExisting"]</option>
+						</select>
+						@if (ModuleType == "new")
 						{
-							<select class="form-select" @onchange="(e => CategoryChanged(e))">
-								@foreach (var category in _categories)
-								{
-									if (category == Category)
+							@if (_moduleDefinitions != null)
+							{
+								<select class="form-select" @onchange="(e => CategoryChanged(e))">
+									@foreach (var category in _categories)
 									{
-										<option value="@category" selected>@category @Localizer["Modules"]</option>
+										if (category == Category)
+										{
+											<option value="@category" selected>@category @Localizer["Modules"]</option>
+										}
+										else
+										{
+											<option value="@category">@category @Localizer["Modules"]</option>
+										}
+									}
+								</select>
+								<select class="form-select" @onchange="(e => ModuleChanged(e))">
+									@if (ModuleDefinitionName == "-")
+									{
+										<option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
 									}
 									else
 									{
-										<option value="@category">@category @Localizer["Modules"]</option>
+										<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
 									}
-								}
-							</select>
-							<select class="form-select" @onchange="(e => ModuleChanged(e))">
-								@if (ModuleDefinitionName == "-")
-								{
-									<option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
-								}
-								else
-								{
-									<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
-								}
-								@foreach (var moduledefinition in _moduleDefinitions)
-								{
-									if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
+									@foreach (var moduledefinition in _moduleDefinitions)
 									{
-										if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
+										if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
 										{
-											<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
+											if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
+											{
+												<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
+											}
 										}
 									}
+								</select>
+							}
+						}
+						else
+						{
+							<select class="form-select" @onchange="(e => PageChanged(e))">
+								<option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
+								@foreach (Page p in _pages)
+								{
+									<option value="@p.PageId">@p.Name</option>
+								}
+							</select>
+							<select class="form-select" @bind="@ModuleId">
+								<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
+								@foreach (Module module in _modules)
+								{
+									<option value="@module.ModuleId">@module.Title</option>
 								}
 							</select>
-							@((MarkupString) Description)
 						}
-					}
-					else
-					{
-						<select class="form-select" @onchange="(e => PageChanged(e))">
-							<option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
-							@foreach (Page p in _pages)
-							{
-								<option value="@p.PageId">@p.Name</option>
-							}
-						</select>
-						<select class="form-select" @bind="@ModuleId">
-							<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
-							@foreach (Module module in _modules)
-							{
-								<option value="@module.ModuleId">@module.Title</option>
-							}
-						</select>
-					}
+					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col text-center">
-					<label for="Title" class="control-label">@Localizer["Title"] </label>
-					<input type="text" name="Title" class="form-control" @bind="@Title" />
-				</div>
-			</div>
-			@if (_pane.Length > 1)
-			{
 				<div class="row">
 					<div class="col text-center">
-						<label for="Pane" class="control-label">@Localizer["Pane"] </label>
-						<select class="form-select" @bind="@Pane">
-							@foreach (string pane in PageState.Page.Panes)
+						<label for="Title" class="control-label">@Localizer["Title"] </label>
+						<input type="text" name="Title" class="form-control" @bind="@Title" />
+					</div>
+				</div>
+				@if (_pane.Length > 1)
+				{
+					<div class="row">
+						<div class="col text-center">
+							<label for="Pane" class="control-label">@Localizer["Pane"] </label>
+							<select class="form-select" @bind="@Pane">
+								@foreach (string pane in PageState.Page.Panes)
+								{
+									<option value="@pane">@pane Pane</option>
+								}
+							</select>
+						</div>
+					</div>
+				}
+				<div class="row">
+					<div class="col text-center">
+						<label for="Container" class="control-label">@Localizer["Container"] </label>
+						<select class="form-select" @bind="@ContainerType">
+							@foreach (var container in _containers)
 							{
-								<option value="@pane">@pane Pane</option>
+								<option value="@container.TypeName">@container.Name</option>
 							}
 						</select>
 					</div>
 				</div>
-			}
-			<div class="row">
-				<div class="col text-center">
-					<label for="Container" class="control-label">@Localizer["Container"] </label>
-					<select class="form-select" @bind="@ContainerType">
-						@foreach (var container in _containers)
-						{
-							<option value="@container.TypeName">@container.Name</option>
-						}
-					</select>
+				<div class="row">
+					<div class="col text-center">
+						<label for="visibility" class="control-label">@Localizer["Visibility"]</label>
+						<select class="form-select" @bind="@Visibility">
+							<option value="edit" selected>@Localizer["VisibilityEdit"]</option>
+							<option value="view">@Localizer["VisibilityView"]</option>
+						</select>
+					</div>
 				</div>
-			</div>
-			<br />
-			<button type="button" class="btn btn-primary col-12" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
-			@((MarkupString) Message)
-			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-			{
-				<hr class="app-rule" />
-				<NavLink class="btn btn-info col-12" data-bs-dismiss="offcanvas" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink>
-			}
+				<button type="button" class="btn btn-primary col-12 mt-4" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
+				@((MarkupString) Message)
 			</div>
 		</div>
 	</div>
 }
 
 @code{
+	private bool _deleteConfirmation = false;
+	private List<string> _categories = new List<string>();
+	private List<ModuleDefinition> _allModuleDefinitions;
+	private List<ModuleDefinition> _moduleDefinitions;
+	private List<Page> _pages = new List<Page>();
+	private List<Module> _modules = new List<Module>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
+	private string _category = "Common";
 
-    private bool _deleteConfirmation = false;
-    private List<string> _categories = new List<string>();
-    private List<ModuleDefinition> _allModuleDefinitions;
-    private List<ModuleDefinition> _moduleDefinitions;
-    private List<Page> _pages = new List<Page>();
-    private List<Module> _modules = new List<Module>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
-    private string _category = "Common";
+	protected string PageId { get; private set; } = "-";
+	protected string ModuleId { get; private set; } = "-";
+	protected string ModuleType { get; private set; } = "new";
+	protected string ModuleDefinitionName { get; private set; } = "-";
 
-    protected string PageId { get; private set; } = "-";
-    protected string ModuleId { get; private set; } = "-";
-    protected string ModuleType { get; private set; } = "new";
-    protected string ModuleDefinitionName { get; private set; } = "-";
+	protected string Category
+	{
+		get => _category;
+		private set
+		{
+			if (_category != value)
+			{
+				_category = value;
+				_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
+				ModuleDefinitionName = "-";
+				Message = "";
+				StateHasChanged();
+				_ = UpdateSettingsAsync();
+			}
+		}
+	}
 
-    protected string Category
-    {
-        get => _category;
-        private set
-        {
-            if (_category != value)
-            {
-                _category = value;
-                _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
-                ModuleDefinitionName = "-";
-                Description = "";
-                StateHasChanged();
-                _ = UpdateSettingsAsync();
-            }
-        }
-    }
+	protected string Pane
+	{
+		get => _pane;
+		private set
+		{
+			if (_pane != value)
+			{
+				_pane = value;
+				_ = UpdateSettingsAsync();
+			}
+		}
+	}
 
-    protected string Pane
-    {
-        get => _pane;
-        private set
-        {
-            if (_pane != value)
-            {
-                _pane = value;
-                _ = UpdateSettingsAsync();
-            }
-        }
-    }
+	protected string Title { get; private set; } = "";
+	protected string ContainerType { get; private set; } = "";
+	protected string Visibility { get; private set; } = "edit";
+	protected string Message { get; private set; } = "";
+
+	[Parameter]
+	public string ButtonClass { get; set; } = "btn-outline-secondary";
+
+	[Parameter]
+	public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
+
+	[Parameter]
+	public string HeaderClass { get; set; } = "offcanvas-header";
+
+	[Parameter]
+	public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
+
+	[Parameter]
+	public bool ShowLanguageSwitcher { get; set; } = true;
 
 
-    protected string Description { get; private set; } = "";
+	protected override async Task OnParametersSetAsync()
+	{
+		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+		{
+			_pages?.Clear();
 
-    protected string Title { get; private set; } = "";
-    protected string ContainerType { get; private set; } = "";
-    protected string Message { get; private set; } = "";
+			foreach (Page p in PageState.Pages)
+			{
+				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+				{
+					_pages.Add(p);
+				}
+			}
+			await LoadSettingsAsync();
 
-    [Parameter]
-    public string ButtonClass { get; set; } = "btn-outline-secondary";
+			var themes = await ThemeService.GetThemesAsync();
+			_containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
+			ContainerType = PageState.Site.DefaultContainerType;
+			_allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+			_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
+			_categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
+		}
+	}
 
-    [Parameter]
-    public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
+	private void CategoryChanged(ChangeEventArgs e)
+	{
+		Category = (string)e.Value;
+	}
 
-    [Parameter]
-    public string HeaderClass { get; set; } = "offcanvas-header";
+	private void ModuleChanged(ChangeEventArgs e)
+	{
+		ModuleDefinitionName = (string)e.Value;
+		if (ModuleDefinitionName != "-")
+		{
+			var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName);
+			Message = "<div class=\"alert alert-info mt-2 text-center\" role=\"alert\">" + moduleDefinition.Description + "</div>";
+		}
+		else
+		{
+			Message = "";
+		}
+		StateHasChanged();
+	}
 
-    [Parameter]
-    public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
+	private void PageChanged(ChangeEventArgs e)
+	{
+		PageId = (string)e.Value;
+		if (PageId != "-")
+		{
+			_modules = PageState.Modules
+				.Where(module => module.PageId == int.Parse(PageId)
+									&& !module.IsDeleted
+									&& UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
+				.ToList();
+		}
+		ModuleId = "-";
+		StateHasChanged();
+	}
 
-    [Parameter]
-    public bool ShowLanguageSwitcher { get; set; } = true;
+	private async Task AddModule()
+	{
+		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+		{
+			if ((ModuleType == "new" && ModuleDefinitionName != "-") || (ModuleType != "new" && ModuleId != "-"))
+			{
+				if (ModuleType == "new")
+				{
+					Module module = new Module();
+					module.SiteId = PageState.Site.SiteId;
+					module.PageId = PageState.Page.PageId;
+					module.ModuleDefinitionName = ModuleDefinitionName;
+					module.AllPages = false;
 
+					List<PermissionString> permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions);
+					if (Visibility == "view")
+					{
+						// set module view permissions to page view permissions
+						permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions;
+					}
+					else
+					{
+						// set module view permissions to page edit permissions
+						permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions;
+					}
+					module.Permissions = UserSecurity.SetPermissionStrings(permissions);
 
-    protected override async Task OnParametersSetAsync()
-    {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
-        {
-            _pages?.Clear();
+					module = await ModuleService.AddModuleAsync(module);
+					ModuleId = module.ModuleId.ToString();
+				}
 
-            foreach (Page p in PageState.Pages)
-            {
-                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                {
-                    _pages.Add(p);
-                }
-            }
-            await LoadSettingsAsync();
-
-            var themes = await ThemeService.GetThemesAsync();
-            _containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
-            ContainerType = PageState.Site.DefaultContainerType;
-            _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
-            _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
-        }
-    }
-
-    private void CategoryChanged(ChangeEventArgs e)
-    {
-        Category = (string)e.Value;
-    }
-
-    private void ModuleChanged(ChangeEventArgs e)
-    {
-        ModuleDefinitionName = (string)e.Value;
-        if (ModuleDefinitionName != "-")
-        {
-            var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName);
-            Description = "<br /><div class=\"alert alert-info\" role=\"alert\">" + moduleDefinition.Description + "</div>";
-        }
-        else
-        {
-            Description = "";
-        }
-
-        StateHasChanged();
-    }
-
-    private void PageChanged(ChangeEventArgs e)
-    {
-        PageId = (string)e.Value;
-        if (PageId != "-")
-        {
-            _modules = PageState.Modules
-                .Where(module => module.PageId == int.Parse(PageId)
-                                 && !module.IsDeleted
-                                 && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
-                .ToList();
-        }
-        ModuleId = "-";
-        StateHasChanged();
-    }
-
-    private async Task AddModule()
-    {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
-        {
-            if ((ModuleType == "new" && ModuleDefinitionName != "-") || (ModuleType != "new" && ModuleId != "-"))
-            {
-                if (ModuleType == "new")
-                {
-                    Module module = new Module();
-                    module.SiteId = PageState.Site.SiteId;
-                    module.PageId = PageState.Page.PageId;
-                    module.ModuleDefinitionName = ModuleDefinitionName;
-                    module.AllPages = false;
-
-                    // set module view permissions to page edit permissions
-                    List<PermissionString> permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions);
-                    permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions;
-                    module.Permissions = UserSecurity.SetPermissionStrings(permissions);
-
-                    module = await ModuleService.AddModuleAsync(module);
-                    ModuleId = module.ModuleId.ToString();
-                }
-
-                var pageModule = new PageModule
+				var pageModule = new PageModule
                 {
                     PageId = PageState.Page.PageId,
                     ModuleId = int.Parse(ModuleId),
                     Title = Title
                 };
-                if (pageModule.Title == "")
-                {
-                    if (ModuleType == "new")
-                    {
-                        pageModule.Title = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName)?.Name;
-                    }
-                    else
-                    {
-                        pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(ModuleId))?.Title;
-                    }
-                }
+				if (pageModule.Title == "")
+				{
+					if (ModuleType == "new")
+					{
+						pageModule.Title = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName)?.Name;
+					}
+					else
+					{
+						pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(ModuleId))?.Title;
+					}
+				}
 
-                pageModule.Pane = Pane;
-                pageModule.Order = int.MaxValue;
-                pageModule.ContainerType = ContainerType;
+				pageModule.Pane = Pane;
+				pageModule.Order = int.MaxValue;
+				pageModule.ContainerType = ContainerType;
 
-                if (pageModule.ContainerType == PageState.Site.DefaultContainerType)
-                {
-                    pageModule.ContainerType = "";
-                }
+				if (pageModule.ContainerType == PageState.Site.DefaultContainerType)
+				{
+					pageModule.ContainerType = "";
+				}
 
-                await PageModuleService.AddPageModuleAsync(pageModule);
-                await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
+				await PageModuleService.AddPageModuleAsync(pageModule);
+				await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
 
-                Message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
-                NavigationManager.NavigateTo(NavigateUrl());
+				Message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
+				Title = "";
+				NavigationManager.NavigateTo(NavigateUrl());
             }
             else
             {
diff --git a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
index cc454412..d8afa02e 100644
--- a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
+++ b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs
@@ -2,6 +2,7 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using Oqtane.Enums;
 using Oqtane.Providers;
 using Oqtane.Security;
 using Oqtane.Services;
@@ -17,6 +18,7 @@ namespace Oqtane.Themes.Controls
         [Inject] public IJSRuntime jsRuntime { get; set; }
         [Inject] public IServiceProvider ServiceProvider { get; set; }
         [Inject] public SiteState SiteState { get; set; }
+        [Inject] public ILogService LoggingService { get; set; }
 
         protected void LoginUser()
         {
@@ -31,6 +33,8 @@ namespace Oqtane.Themes.Controls
         protected async Task LogoutUser()
         {
             await UserService.LogoutUserAsync(PageState.User);
+            await LoggingService.Log(PageState.Alias, PageState.Page.PageId, PageState.ModuleId, PageState.User.UserId, GetType().AssemblyQualifiedName, "Logout", LogFunction.Security, LogLevel.Information, null, "User Logout For Username {Username}", PageState.User.Username);
+
             PageState.User = null;
             bool authorizedtoviewpage = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, PageState.Page.Permissions);
 
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor
index b90d8c32..cc3647f8 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor
@@ -3,7 +3,7 @@
 @inject ISettingService SettingService
 
 <div class="@_classes">
-    @if (_title)
+    @if (_title && ModuleState.Title != "-")
     {
         <div class="row px-4">
             <div class="d-flex flex-nowrap">
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor
index 44e41bbd..b0c7774f 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor
@@ -6,7 +6,7 @@
 
 <div class="container">
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="title" ResourceKey="Title" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label>
+        <Label Class="col-sm-3" For="title" ResourceKey="Title" ResourceType="@resourceType" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label>
         <div class="col-sm-9">
             <select id="title" class="form-select" @bind="@_title">
                 <option value="true">Yes</option>
@@ -15,7 +15,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="background\" ResourceKey="Background" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label>
+        <Label Class="col-sm-3" For="background\" ResourceKey="Background" ResourceType="@resourceType" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label>
         <div class="col-sm-9">
             <select id="background" class="form-select" @bind="@_background">
                 <option value="">None</option>
@@ -31,7 +31,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="text" ResourceKey="Text" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label>
+        <Label Class="col-sm-3" For="text" ResourceKey="Text" ResourceType="@resourceType" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label>
         <div class="col-sm-9">
             <select id="text" class="form-select" @bind="@_text">
                 <option value="">None</option>
@@ -47,7 +47,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="border" ResourceKey="Border" HelpText="Optionally Specify A Border For The Container">Border Color:</Label>
+        <Label Class="col-sm-3" For="border" ResourceKey="Border" ResourceType="@resourceType" HelpText="Optionally Specify A Border For The Container">Border Color:</Label>
         <div class="col-sm-9">
             <select id="border" class="form-select" @bind="@_border">
                 <option value="">None</option>
@@ -65,41 +65,42 @@
     </div>
 </div>
 
-    @code {
-        private string _title = "true";
-        private string _background = "";
-        private string _text = "";
-        private string _border = "";
+@code {
+	private string resourceType = "Oqtane.Themes.OqtaneTheme.ContainerSettings, Oqtane.Client"; // for localization
+    private string _title = "true";
+    private string _background = "";
+    private string _text = "";
+    private string _border = "";
 
-        protected override void OnInitialized()
+    protected override void OnInitialized()
+    {
+        try
         {
-            try
-            {
-                _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
-                _background = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
-                _text = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
-                _border = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
+            _background = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
+            _text = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
+            _border = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
         }
-
-        public async Task UpdateSettings()
+        catch (Exception ex)
         {
-            try
-            {
-                var settings = ModuleState.Settings;
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Background", _background);
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Text", _text);
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Border", _border);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Background", _background);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Text", _text);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Border", _border);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
index ecebce19..25f03f45 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
@@ -8,7 +8,7 @@
 
 <div class="container">
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="scope" ResourceKey="Scope" HelpText="Specify if the settings are applicable to this page or the entire site.">Setting Scope:</Label>
+        <Label Class="col-sm-3" For="scope" ResourceKey="Scope" ResourceType="@resourceType" HelpText="Specify if the settings are applicable to this page or the entire site.">Setting Scope:</Label>
         <div class="col-sm-9">
             <select id="scope" class="form-select" value="@_scope" @onchange="(e => ScopeChanged(e))">
                 @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
@@ -20,7 +20,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="login" ResourceKey="Login" HelpText="Specify if a Login option should be displayed. Note that this option does not prevent the login page from being accessible via a direct url.">Show Login?</Label>
+        <Label Class="col-sm-3" For="login" ResourceKey="Login" ResourceType="@resourceType" HelpText="Specify if a Login option should be displayed. Note that this option does not prevent the login page from being accessible via a direct url.">Show Login?</Label>
         <div class="col-sm-9">
             <select id="login" class="form-select" @bind="@_login">
                 <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
@@ -30,7 +30,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="register" ResourceKey="Register" HelpText="Specify if a Register option should be displayed. Note that this option is also dependent on the Allow Registration option in Site Settings.">Show Register?</Label>
+        <Label Class="col-sm-3" For="register" ResourceKey="Register" ResourceType="@resourceType" HelpText="Specify if a Register option should be displayed. Note that this option is also dependent on the Allow Registration option in Site Settings.">Show Register?</Label>
         <div class="col-sm-9">
             <select id="register" class="form-select" @bind="@_register">
                 <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
@@ -40,7 +40,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="footer" ResourceKey="Footer" HelpText="Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page">Display Fixed Footer?</Label>
+        <Label Class="col-sm-3" For="footer" ResourceKey="Footer" ResourceType="@resourceType" HelpText="Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page">Display Fixed Footer?</Label>
         <div class="col-sm-9">
             <select id="footer" class="form-select" @bind="@_footer">
                 <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
@@ -52,16 +52,17 @@
 </div>
 
 @code {
-    private string _scope = "page";
-    private string _login = "-";
-    private string _register = "-";
-    private string _footer = "-";
+	private string resourceType = "Oqtane.Themes.OqtaneTheme.ThemeSettings, Oqtane.Client"; // for localization
+	private string _scope = "page";
+	private string _login = "-";
+	private string _register = "-";
+	private string _footer = "-";
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            await LoadSettings();
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			await LoadSettings();
         }
         catch (Exception ex)
         {
@@ -110,7 +111,7 @@
         {
             if (_scope == "site")
             {
-                var settings = PageState.Site.Settings;
+                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
                 if (_login != "-")
                 {
                     settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login, true);
@@ -127,7 +128,7 @@
             }
             else
             {
-                var settings = PageState.Page.Settings;
+                var settings = await SettingService.GetPageSettingsAsync(PageState.Page.PageId);
                 if (_login != "-")
                 {
                     settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login);
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 2771105c..ccf80e04 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -104,14 +104,19 @@ namespace Oqtane.Themes
             return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
         }
 
-        public string ImageUrl(int fileid, int width, int height, string mode)
+        public string ImageUrl(int fileid, int width, int height)
         {
-            return ImageUrl(fileid, width, height, mode, 0);
+            return ImageUrl(fileid, width, height, "");
         }
 
-        public string ImageUrl(int fileid, int width, int height, string mode, int rotate)
+        public string ImageUrl(int fileid, int width, int height, string mode)
         {
-            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, rotate);
+            return ImageUrl(fileid, width, height, mode, "", "", 0, false);
+        }
+
+        public string ImageUrl(int fileid, int width, int height, string mode, string position, string background, int rotate, bool recreate)
+        {
+            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
     }
 }
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index 2aa9fb9f..28b72307 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -262,5 +262,22 @@ namespace Oqtane.UI
                 return Task.CompletedTask;
             }
         }
+
+        public Task ScrollTo(int top, int left, string behavior)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(behavior)) behavior = "smooth";
+                _jsRuntime.InvokeVoidAsync(
+                    "Oqtane.Interop.scrollTo",
+                    top, left, behavior);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
+
     }
 }
diff --git a/Oqtane.Client/UI/PageState.cs b/Oqtane.Client/UI/PageState.cs
index bc0fdacf..5b14ad00 100644
--- a/Oqtane.Client/UI/PageState.cs
+++ b/Oqtane.Client/UI/PageState.cs
@@ -21,5 +21,6 @@ namespace Oqtane.UI
         public DateTime LastSyncDate { get; set; }
         public Oqtane.Shared.Runtime Runtime { get; set; }
         public int VisitorId { get; set; }
+        public string RemoteIPAddress { get; set; }
     }
 }
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index a6a222db..360ff6a1 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -9,6 +9,7 @@
 @inject IPageService PageService
 @inject IUserService UserService
 @inject IModuleService ModuleService
+@inject IUrlMappingService UrlMappingService
 @inject ILogService LogService
 @implements IHandleAfterRender
 
@@ -82,134 +83,137 @@
 		var action = (!string.IsNullOrEmpty(route.Action)) ? route.Action : Constants.DefaultAction; 
 		var querystring = ParseQueryString(route.Query);
 
-        // reload the client application if there is a forced reload or the user navigated to a site with a different alias 
-        if (querystring.ContainsKey("reload") || (!route.AbsolutePath.Substring(1).ToLower().StartsWith(SiteState.Alias.Path.ToLower()) && !string.IsNullOrEmpty(SiteState.Alias.Path)))
-        {
-            NavigationManager.NavigateTo(_absoluteUri.Replace("?reload", ""), true);
-            return;
-        }
-        else
-        {
-            // the refresh parameter is used to refresh the PageState
-            if (querystring.ContainsKey("refresh"))
-            {
-                refresh = UI.Refresh.Site;
-            }
-        }
+		// reload the client application if there is a forced reload or the user navigated to a site with a different alias 
+		if (querystring.ContainsKey("reload") || (!route.AbsolutePath.Substring(1).ToLower().StartsWith(SiteState.Alias.Path.ToLower()) && !string.IsNullOrEmpty(SiteState.Alias.Path)))
+		{
+			NavigationManager.NavigateTo(_absoluteUri.Replace("?reload", ""), true);
+			return;
+		}
+		else
+		{
+			// the refresh parameter is used to refresh the PageState
+			if (querystring.ContainsKey("refresh"))
+			{
+				refresh = UI.Refresh.Site;
+			}
+		}
 
-        if (PageState != null)
-        {
-            editmode = PageState.EditMode;
-            lastsyncdate = PageState.LastSyncDate;
-        }
+		if (PageState != null)
+		{
+			editmode = PageState.EditMode;
+			lastsyncdate = PageState.LastSyncDate;
+		}
 
-        // process any sync events
-        var sync = await SyncService.GetSyncAsync(lastsyncdate);
-        lastsyncdate = sync.SyncDate;
-        if (sync.SyncEvents.Any())
-        {
-            // reload client application if server was restarted or site runtime/rendermode was modified
-            if (PageState != null && sync.SyncEvents.Exists(item => (item.TenantId == -1 || item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId) && item.Reload))
-            {
-                NavigationManager.NavigateTo(_absoluteUri, true);
-                return;
-            }
-            if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId))
-            {
-                refresh = UI.Refresh.Site;
-            }
-        }
+		// process any sync events
+		var sync = await SyncService.GetSyncAsync(lastsyncdate);
+		lastsyncdate = sync.SyncDate;
+		if (sync.SyncEvents.Any())
+		{
+			// reload client application if server was restarted or site runtime/rendermode was modified
+			if (PageState != null && sync.SyncEvents.Exists(item => (item.TenantId == -1 || item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId) && item.Reload))
+			{
+				NavigationManager.NavigateTo(_absoluteUri, true);
+				return;
+			}
+			if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.Site && item.EntityId == SiteState.Alias.SiteId))
+			{
+				refresh = UI.Refresh.Site;
+			}
+		}
 
-        if (refresh == UI.Refresh.Site || PageState == null || PageState.Alias.SiteId != SiteState.Alias.SiteId)
-        {
-            site = await SiteService.GetSiteAsync(SiteState.Alias.SiteId);
-            refresh = UI.Refresh.Site;
-        }
-        else
-        {
-            site = PageState.Site;
-        }
+		if (refresh == UI.Refresh.Site || PageState == null || PageState.Alias.SiteId != SiteState.Alias.SiteId)
+		{
+			site = await SiteService.GetSiteAsync(SiteState.Alias.SiteId);
+			refresh = UI.Refresh.Site;
+		}
+		else
+		{
+			site = PageState.Site;
+		}
 
-        if (site != null)
-        {
-            if (PageState == null || refresh == UI.Refresh.Site)
-            {
-                // get user
-                var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
-                if (authState.User.Identity.IsAuthenticated)
-                {
-                    user = await UserService.GetUserAsync(authState.User.Identity.Name, site.SiteId);
-                    user.IsAuthenticated = authState.User.Identity.IsAuthenticated;
-                }
-            }
-            else
-            {
-                user = PageState.User;
-            }
+		if (site != null)
+		{
+			if (PageState == null || refresh == UI.Refresh.Site)
+			{
+				// get user
+				var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+				if (authState.User.Identity.IsAuthenticated)
+				{
+					user = await UserService.GetUserAsync(authState.User.Identity.Name, site.SiteId);
+					if (user != null)
+					{
+						user.IsAuthenticated = authState.User.Identity.IsAuthenticated;
+					}
+				}
+			}
+			else
+			{
+				user = PageState.User;
+			}
 
-            // process any sync events for user
-            if (refresh != UI.Refresh.Site && user != null && sync.SyncEvents.Any())
-            {
-                if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.User && item.EntityId == user.UserId))
-                {
-                    refresh = UI.Refresh.Site;
-                }
-            }
+			// process any sync events for user
+			if (refresh != UI.Refresh.Site && user != null && sync.SyncEvents.Any())
+			{
+				if (sync.SyncEvents.Exists(item => item.EntityName == EntityNames.User && item.EntityId == user.UserId))
+				{
+					refresh = UI.Refresh.Site;
+				}
+			}
 
-            if (PageState == null || refresh == UI.Refresh.Site)
-            {
-                pages = await PageService.GetPagesAsync(site.SiteId);
-            }
-            else
-            {
-                pages = PageState.Pages;
-            }
+			if (PageState == null || refresh == UI.Refresh.Site)
+			{
+				pages = await PageService.GetPagesAsync(site.SiteId);
+			}
+			else
+			{
+				pages = PageState.Pages;
+			}
 
-            if (PageState == null || refresh == UI.Refresh.Site)
-            {
-                page = pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
-            }
-            else
-            {
-                page = PageState.Page;
-            }
+			if (PageState == null || refresh == UI.Refresh.Site)
+			{
+				page = pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
+			}
+			else
+			{
+				page = PageState.Page;
+			}
 
-            // get the page if the path has changed
-            if (page == null || page.Path != route.PagePath)
-            {
-                page = pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
+			// get the page if the path has changed
+			if (page == null || page.Path != route.PagePath)
+			{
+				page = pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
 				// if the home page path does not exist then use the first page in the collection (a future enhancement would allow the admin to specify the home page)
 				if (page == null && route.PagePath == "")
 				{
 					page = pages.FirstOrDefault();
 				}
-                editmode = false;
-            }
+				editmode = false;
+			}
 
-            if (page != null)
-            {
-                if (PageState == null)
-                {
-                    editmode = false;
-                }
+			if (page != null)
+			{
+				if (PageState == null)
+				{
+					editmode = false;
+				}
 
-                // check if user is authorized to view page
-                if (UserSecurity.IsAuthorized(user, PermissionNames.View, page.Permissions))
-                {
-                    page = await ProcessPage(page, site, user);
+				// check if user is authorized to view page
+				if (UserSecurity.IsAuthorized(user, PermissionNames.View, page.Permissions))
+				{
+					page = await ProcessPage(page, site, user);
 
-                    if (PageState == null || refresh == UI.Refresh.Site)
-                    {
-                        modules = await ModuleService.GetModulesAsync(site.SiteId);
-                    }
-                    else
-                    {
-                        modules = PageState.Modules;
-                    }
+					if (PageState == null || refresh == UI.Refresh.Site)
+					{
+						modules = await ModuleService.GetModulesAsync(site.SiteId);
+					}
+					else
+					{
+						modules = PageState.Modules;
+					}
 
-                    (page, modules) = ProcessModules(page, modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType);
+					(page, modules) = ProcessModules(page, modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType);
 
-                    _pagestate = new PageState
+					_pagestate = new PageState
                     {
                         Alias = SiteState.Alias,
                         Site = site,
@@ -225,28 +229,39 @@
                         EditMode = editmode,
                         LastSyncDate = lastsyncdate,
                         Runtime = runtime,
-						VisitorId = VisitorId
+						VisitorId = VisitorId,
+						RemoteIPAddress = SiteState.RemoteIPAddress
                     };
 
-                    OnStateChange?.Invoke(_pagestate);
-                }
-            }
-            else
-            {
-                if (user == null)
-                {
-                    // redirect to login page
-                    NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "login", "?returnurl=" + route.AbsolutePath));
-                }
-                else
-                {
-                    await LogService.Log(null, null, user.UserId, GetType().AssemblyQualifiedName, Utilities.GetTypeNameLastSegment(GetType().AssemblyQualifiedName, 1), LogFunction.Security, LogLevel.Error, null, "Page Does Not Exist Or User Is Not Authorized To View Page {Path}", route.PagePath);
-                    if (route.PagePath != "")
-                    {
-                        // redirect to home page
-                        NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "", ""));
-                    }
-                }
+					OnStateChange?.Invoke(_pagestate);
+				}
+			}
+			else // page not found
+			{
+				// look for url mapping
+				var urlMapping = await UrlMappingService.GetUrlMappingAsync(site.SiteId, route.PagePath);
+				if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
+				{
+                    var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl;
+					NavigationManager.NavigateTo(url, false);
+				}
+				else // not mapped
+				{
+					if (user == null)
+					{
+						// redirect to login page if user not logged in as they may need to be authenticated
+						NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "login", "?returnurl=" + route.AbsolutePath));
+					}
+					else
+					{
+						await LogService.Log(null, null, user.UserId, GetType().AssemblyQualifiedName, Utilities.GetTypeNameLastSegment(GetType().AssemblyQualifiedName, 1), LogFunction.Security, LogLevel.Error, null, "Page Does Not Exist Or User Is Not Authorized To View Page {Path}", route.PagePath);
+						if (route.PagePath != "")
+						{
+							// redirect to home page
+							NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "", ""));
+						}
+					}
+				}
             }
         }
         else
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 0f96323e..77f95a6c 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -28,32 +28,29 @@
 
 	protected override async Task OnAfterRenderAsync(bool firstRender)
 	{
-		if (!firstRender)
+        var interop = new Interop(JsRuntime);
+
+        // manage stylesheets for this page 
+        string batch = DateTime.UtcNow.ToString("yyyyMMddHHmmssfff");
+        var links = new List<object>();
+        foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet && item.Declaration != ResourceDeclaration.Global))
+        {
+            links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
+        }
+        if (links.Any())
+        {
+            await interop.IncludeLinks(links.ToArray());
+        }
+		await interop.RemoveElementsById("app-stylesheet", "", "app-stylesheet-" + batch + "-00");
+
+		// set page title
+		if (!string.IsNullOrEmpty(PageState.Page.Title))
 		{
-			var interop = new Interop(JsRuntime);
-
-			// set page title
-			if (!string.IsNullOrEmpty(PageState.Page.Title))
-			{
-				await interop.UpdateTitle(PageState.Page.Title);
-			}
-			else
-			{
-				await interop.UpdateTitle(PageState.Site.Name + " - " + PageState.Page.Name);
-			}
-
-			// manage stylesheets for this page 
-			string batch = DateTime.Now.ToString("yyyyMMddHHmmssfff");
-			var links = new List<object>();
-			foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet && item.Declaration != ResourceDeclaration.Global))
-			{
-				links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
-			}
-			if (links.Any())
-			{
-				await interop.IncludeLinks(links.ToArray());
-			}
-			await interop.RemoveElementsById("app-stylesheet", "", "app-stylesheet-" + batch + "-00");
+			await interop.UpdateTitle(PageState.Page.Title);
+		}
+		else
+		{
+			await interop.UpdateTitle(PageState.Site.Name + " - " + PageState.Page.Name);
 		}
 	}
 }
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
index 8fa13d47..29192e1f 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
index 5a84eb0e..e3179fa4 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.MySQL</id>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane MySQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
index ccecb9c8..77bd539c 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
index c0d93f15..fbcab3fa 100644
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.PostgreSQL</id>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane PostgreSQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
index 88db226e..350080b6 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
index b4096e97..1f9e2822 100644
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.SqlServer</id>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQL Server Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
index 33897905..6432b884 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
index 0c22d5d2..658f43b6 100644
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.Sqlite</id>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQLite Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>
diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec
index 0e26106a..21248344 100644
--- a/Oqtane.Package/Oqtane.Client.nuspec
+++ b/Oqtane.Package/Oqtane.Client.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Client</id>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec
index 2d7163b4..bffa7371 100644
--- a/Oqtane.Package/Oqtane.Framework.nuspec
+++ b/Oqtane.Package/Oqtane.Framework.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Framework</id>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v3.0.1/Oqtane.Framework.3.0.1.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane framework</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec
index 076d25f2..ad2f9220 100644
--- a/Oqtane.Package/Oqtane.Server.nuspec
+++ b/Oqtane.Package/Oqtane.Server.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Server</id>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec
index b1a5fdaa..60d51d23 100644
--- a/Oqtane.Package/Oqtane.Shared.nuspec
+++ b/Oqtane.Package/Oqtane.Shared.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/Oqtane.Updater.nuspec b/Oqtane.Package/Oqtane.Updater.nuspec
index c5898ee6..8659bb96 100644
--- a/Oqtane.Package/Oqtane.Updater.nuspec
+++ b/Oqtane.Package/Oqtane.Updater.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>
diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1
index f0f8d570..139d67bb 100644
--- a/Oqtane.Package/install.ps1
+++ b/Oqtane.Package/install.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.0.1.Install.zip" -Force 
\ No newline at end of file
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.0.2.Install.zip" -Force 
\ No newline at end of file
diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1
index b91f0f62..a5f523d2 100644
--- a/Oqtane.Package/upgrade.ps1
+++ b/Oqtane.Package/upgrade.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.0.1.Upgrade.zip" -Force 
\ No newline at end of file
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net6.0\publish\*" -DestinationPath "Oqtane.Framework.3.0.2.Upgrade.zip" -Force 
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
index bb1182e9..34c2ab2a 100644
--- a/Oqtane.Server/Controllers/FileController.cs
+++ b/Oqtane.Server/Controllers/FileController.cs
@@ -19,7 +19,6 @@ using Oqtane.Extensions;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.PixelFormats;
 using System.Net.Http;
 
 // ReSharper disable StringIndexOfIsCultureSpecific.1
@@ -508,8 +507,8 @@ namespace Oqtane.Controllers
             return System.IO.File.Exists(errorPath) ? PhysicalFile(errorPath, MimeUtilities.GetMimeType(errorPath)) : null;
         }
 
-        [HttpGet("image/{id}/{width}/{height}/{mode?}/{rotate?}")]
-        public IActionResult GetImage(int id, int width, int height, string mode, string rotate)
+        [HttpGet("image/{id}/{width}/{height}/{mode}/{position}/{background}/{rotate}/{recreate}")]
+        public IActionResult GetImage(int id, int width, int height, string mode, string position, string background, string rotate, string recreate)
         {
             var file = _files.GetFile(id);
             if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
@@ -519,21 +518,25 @@ namespace Oqtane.Controllers
                     var filepath = _files.GetFilePath(file);
                     if (System.IO.File.Exists(filepath))
                     {
-                        mode = (string.IsNullOrEmpty(mode)) ? "crop" : mode;
-                        rotate = (string.IsNullOrEmpty(rotate)) ? "0" : rotate;
+                        // validation
+                        if (!Enum.TryParse(mode, true, out ResizeMode _)) mode = "crop";
+                        if (!Enum.TryParse(position, true, out AnchorPositionMode _)) position = "center";
+                        if (!Color.TryParseHex("#" + background, out _)) background = "000000";
+                        if (!int.TryParse(rotate, out _)) rotate = "0";
+                        rotate = (int.Parse(rotate) < 0 || int.Parse(rotate) > 360) ? "0" : rotate;
+                        if (!bool.TryParse(recreate, out _)) recreate = "false";
 
-                        string imagepath = filepath.Replace(Path.GetExtension(filepath), "." + width.ToString() + "x" + height.ToString() + "." + mode.ToLower() + ".png");
-                        if (!System.IO.File.Exists(imagepath))
+                        string imagepath = filepath.Replace(Path.GetExtension(filepath), "." + width.ToString() + "x" + height.ToString() + ".png");
+                        if (!System.IO.File.Exists(imagepath) || bool.Parse(recreate))
                         {
                             if ((_userPermissions.IsAuthorized(User, PermissionNames.Edit, file.Folder.Permissions) ||
-                              !string.IsNullOrEmpty(file.Folder.ImageSizes) && file.Folder.ImageSizes.ToLower().Split(",").Contains(width.ToString() + "x" + height.ToString()))
-                              && Enum.TryParse(mode, true, out ResizeMode resizemode))
+                              !string.IsNullOrEmpty(file.Folder.ImageSizes) && file.Folder.ImageSizes.ToLower().Split(",").Contains(width.ToString() + "x" + height.ToString())))
                             {
-                                imagepath = CreateImage(filepath, width, height, resizemode.ToString(), rotate, imagepath);
+                                imagepath = CreateImage(filepath, width, height, mode, position, background, rotate, imagepath);
                             }
                             else
                             {
-                                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Invalid Image Size For Folder Or Invalid Mode Specification {Folder} {Width} {Height} {Mode}", file.Folder, width, height, mode);
+                                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Invalid Image Size For Folder {Folder} {Width} {Height}", file.Folder, width, height);
                                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                             }
                         }
@@ -569,35 +572,37 @@ namespace Oqtane.Controllers
             return System.IO.File.Exists(errorPath) ? PhysicalFile(errorPath, MimeUtilities.GetMimeType(errorPath)) : null;
         }
 
-        private string CreateImage(string filepath, int width, int height, string mode, string rotate, string imagepath)
+        private string CreateImage(string filepath, int width, int height, string mode, string position, string background, string rotate, string imagepath)
         {
             try
             {
-                FileStream stream = new FileStream(filepath, FileMode.Open, FileAccess.Read);
-                using (Image image = Image.Load(stream))
+                using (var stream = new FileStream(filepath, FileMode.Open, FileAccess.Read))
                 {
-                    Enum.TryParse(mode, true, out ResizeMode resizemode);
-
-                    image.Mutate(x =>
-                        x.Resize(new ResizeOptions
-                        {
-                            Size = new Size(width, height),
-                            Mode = resizemode
-                        })
-                        .BackgroundColor(new Rgba32(255, 255, 255, 0)));
-
-                    if (rotate != "0" && int.TryParse(rotate, out int angle))
+                    stream.Position = 0;
+                    using (var image = Image.Load(stream))
                     {
-                        image.Mutate(x => x.Rotate(angle));
-                    }
+                        int.TryParse(rotate, out int angle);
+                        Enum.TryParse(mode, true, out ResizeMode resizemode);
+                        Enum.TryParse(position, true, out AnchorPositionMode anchorpositionmode);
 
-                    image.Save(imagepath, new PngEncoder());
+                        image.Mutate(x => x
+                            .AutoOrient() // auto orient the image
+                            .Rotate(angle)
+                            .Resize(new ResizeOptions
+                            {
+                                Mode = resizemode,
+                                Position = anchorpositionmode,
+                                Size = new Size(width, height)
+                            })
+                            .BackgroundColor(Color.ParseHex("#" + background)));
+
+                        image.Save(imagepath, new PngEncoder());
+                    }
                 }
-                stream.Close();
             }
             catch (Exception ex) 
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Error Creating Image For File {FilePath} {Width} {Height} {Mode} {Error}", filepath, width, height, mode, ex.Message);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Error Creating Image For File {FilePath} {Width} {Height} {Mode} {Rotate} {Error}", filepath, width, height, mode, rotate, ex.Message);
                 imagepath = "";
             }
 
diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs
index 356fd75f..fb3bd99a 100644
--- a/Oqtane.Server/Controllers/JobController.cs
+++ b/Oqtane.Server/Controllers/JobController.cs
@@ -55,7 +55,7 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Post Attempt {Alias}", job);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Post Attempt {Job}", job);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 job = null;
             }
@@ -74,7 +74,7 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Put Attempt {Alias}", job);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Put Attempt {Job}", job);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 job = null;
             }
diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs
index 4de5bb0a..100f30ad 100644
--- a/Oqtane.Server/Controllers/ModuleController.cs
+++ b/Oqtane.Server/Controllers/ModuleController.cs
@@ -75,6 +75,7 @@ namespace Oqtane.Controllers
 
                         module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
                         module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
+                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.Permissions))
                             .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
 
                         modules.Add(module);
@@ -101,7 +102,8 @@ namespace Oqtane.Controllers
                 List<ModuleDefinition> moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
                 module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
                 module.Settings = _settings.GetSettings(EntityNames.Module, id)
-                        .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, module.Permissions))
+                    .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                 return module;
             }
             else
@@ -171,7 +173,7 @@ namespace Oqtane.Controllers
         public void Delete(int id)
         {
             var module = _modules.GetModule(id);
-            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Page, module.ModuleId, PermissionNames.Edit))
+            if (module != null && module.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
             {
                 _modules.DeleteModule(id);
                 _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, _alias.SiteId);
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index cd83718a..5112924f 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -57,6 +57,7 @@ namespace Oqtane.Controllers
                     if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
                     {
                         page.Settings = settings.Where(item => item.EntityId == page.PageId)
+                            .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
                             .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                         pages.Add(page);
                     }
@@ -85,15 +86,16 @@ namespace Oqtane.Controllers
             {
                 page = _pages.GetPage(id, int.Parse(userid));
             }
-            if (_userPermissions.IsAuthorized(User,PermissionNames.View, page.Permissions))
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, page.Permissions))
             {
                 page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId)
-                        .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+                    .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                 return page;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {Page}", page);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {PageId} {UserId}", id, userid);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
@@ -104,24 +106,16 @@ namespace Oqtane.Controllers
         public Page Get(string path, int siteid)
         {
             Page page = _pages.GetPage(WebUtility.UrlDecode(path), siteid);
-            if (page != null && page.SiteId == _alias.SiteId)
+            if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
             {
-                if (_userPermissions.IsAuthorized(User,PermissionNames.View, page.Permissions))
-                {
-                    page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId)
-                            .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
-                    return page;
-                }
-                else
-                {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {Page}", page);
-                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
-                    return null;
-                }
+                page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId)
+                    .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+                    .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+                return page;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {Path} for Site {SiteId}", path, siteid);
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {SiteId} {Path}", siteid, path);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
@@ -267,11 +261,10 @@ namespace Oqtane.Controllers
                 // save url mapping if page path changed
                 if (currentPage.Path != page.Path)
                 {
-                    var url = HttpContext.Request.Scheme + "://" + _alias.Name + "/";
                     var urlMapping = new UrlMapping();
                     urlMapping.SiteId = page.SiteId;
-                    urlMapping.Url = url + currentPage.Path;
-                    urlMapping.MappedUrl = url + page.Path;
+                    urlMapping.Url = currentPage.Path;
+                    urlMapping.MappedUrl = page.Path;
                     urlMapping.Requests = 0;
                     urlMapping.CreatedOn = System.DateTime.UtcNow;
                     urlMapping.RequestedOn = System.DateTime.UtcNow;
diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs
index 33e48589..6165a07e 100644
--- a/Oqtane.Server/Controllers/SettingController.cs
+++ b/Oqtane.Server/Controllers/SettingController.cs
@@ -20,6 +20,7 @@ namespace Oqtane.Controllers
         private readonly ISyncManager _syncManager;
         private readonly ILogManager _logger;
         private readonly Alias _alias;
+        private readonly string _visitorCookie;
 
         public SettingController(ISettingRepository settings, IPageModuleRepository pageModules, IUserPermissions userPermissions, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger)
         {
@@ -29,39 +30,25 @@ namespace Oqtane.Controllers
             _syncManager = syncManager;
             _logger = logger;
             _alias = tenantManager.GetAlias();
+            _visitorCookie = "APP_VISITOR_" + _alias.SiteId.ToString();
         }
 
         // GET: api/<controller>
         [HttpGet]
-        public IEnumerable<Setting> Get(string entityName, int entityid)
+        public IEnumerable<Setting> Get(string entityName, int entityId)
         {
             List<Setting> settings = new List<Setting>();
-            if (IsAuthorized(entityName, entityid, PermissionNames.View))
+            if (IsAuthorized(entityName, entityId, PermissionNames.View))
             {
-                settings = _settings.GetSettings(entityName, entityid).ToList();
-
-                // ispublic filter 
-                switch (entityName)
+                settings = _settings.GetSettings(entityName, entityId).ToList();
+                if (FilterPrivate(entityName, entityId))
                 {
-                    case EntityNames.Tenant:
-                    case EntityNames.ModuleDefinition:
-                    case EntityNames.Host:
-                        if (!User.IsInRole(RoleNames.Host))
-                        {
-                            settings = settings.Where(item => item.IsPublic).ToList();
-                        }
-                        break;
-                    case EntityNames.Site:
-                        if (!User.IsInRole(RoleNames.Admin))
-                        {
-                            settings = settings.Where(item => item.IsPublic).ToList();
-                        }
-                        break;
+                    settings = settings.Where(item => !item.IsPrivate).ToList();
                 }
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityName, entityid);
+                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Settings {EntityName} {EntityId}", entityName, entityId);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
             }
             return settings;
@@ -74,30 +61,15 @@ namespace Oqtane.Controllers
             Setting setting = _settings.GetSetting(entityName, id);
             if (IsAuthorized(setting.EntityName, setting.EntityId, PermissionNames.View))
             {
-                // ispublic filter
-                switch (entityName)
+                if (FilterPrivate(entityName, id) && setting.IsPrivate)
                 {
-                    case EntityNames.Tenant:
-                    case EntityNames.ModuleDefinition:
-                    case EntityNames.Host:
-                        if (!User.IsInRole(RoleNames.Host) && !setting.IsPublic)
-                        {
-                            setting = null;
-                        }
-                        break;
-                    case EntityNames.Site:
-                        if (!User.IsInRole(RoleNames.Admin) && !setting.IsPublic)
-                        {
-                            setting = null;
-                        }
-                        break;
+                    setting = null;
                 }
-
                 return setting;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {Setting}", setting);
+                _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {EntityName} {SettingId}", entityName, id);
                 HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 return null;
             }
@@ -204,20 +176,67 @@ namespace Oqtane.Controllers
                     }
                     break;
                 case EntityNames.Visitor:
-                    var visitorCookie = "APP_VISITOR_" + _alias.SiteId.ToString();
-                    if (int.TryParse(Request.Cookies[visitorCookie], out int visitorId))
+                    authorized = User.IsInRole(RoleNames.Admin);
+                    if (!authorized)
                     {
-                        authorized = (visitorId == entityId);
+                        if (int.TryParse(Request.Cookies[_visitorCookie], out int visitorId))
+                        {
+                            authorized = (visitorId == entityId);
+                        }
+                    }
+                    break;
+                default: // custom entity
+                    if (permissionName == PermissionNames.Edit)
+                    {
+                        authorized = User.IsInRole(RoleNames.Admin) || _userPermissions.IsAuthorized(User, entityName, entityId, permissionName);
                     }
                     else
                     {
-                        authorized = User.IsInRole(RoleNames.Admin);
+                        authorized = true;
                     }
                     break;
             }
             return authorized;
         }
 
+        private bool FilterPrivate(string entityName, int entityId)
+        {
+            bool filter = false;
+            switch (entityName)
+            {
+                case EntityNames.Tenant:
+                case EntityNames.ModuleDefinition:
+                case EntityNames.Host:
+                    filter = !User.IsInRole(RoleNames.Host);
+                    break;
+                case EntityNames.Site:
+                    filter = !User.IsInRole(RoleNames.Admin);
+                    break;
+                case EntityNames.Page:
+                case EntityNames.Module:
+                case EntityNames.Folder:
+                    filter = !_userPermissions.IsAuthorized(User, entityName, entityId, PermissionNames.Edit);
+                    break;
+                case EntityNames.User:
+                    filter = !User.IsInRole(RoleNames.Admin) && _userPermissions.GetUser(User).UserId != entityId;
+                    break;
+                case EntityNames.Visitor:
+                    if (!User.IsInRole(RoleNames.Admin))
+                    {
+                        filter = true;
+                        if (int.TryParse(Request.Cookies[_visitorCookie], out int visitorId))
+                        {
+                            filter = (visitorId != entityId);
+                        }
+                    }
+                    break;
+                default: // custom entity
+                    filter = !User.IsInRole(RoleNames.Admin) && !_userPermissions.IsAuthorized(User, entityName, entityId, PermissionNames.Edit);
+                    break;
+            }
+            return filter;
+        }
+
         private void AddSyncEvent(string EntityName)
         {
             switch (EntityName)
diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs
index 6b4d1c7b..9a50b91f 100644
--- a/Oqtane.Server/Controllers/SiteController.cs
+++ b/Oqtane.Server/Controllers/SiteController.cs
@@ -44,12 +44,9 @@ namespace Oqtane.Controllers
             var site = _sites.GetSite(id);
             if (site.SiteId == _alias.SiteId)
             {
-                var settings = _settings.GetSettings(EntityNames.Site, site.SiteId);
-                if (!User.IsInRole(RoleNames.Admin))
-                {
-                    settings = settings.Where(item => item.IsPublic);
-                }
-                site.Settings = settings.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+                site.Settings = _settings.GetSettings(EntityNames.Site, site.SiteId)
+                    .Where(item => !item.IsPrivate || User.IsInRole(RoleNames.Admin))
+                    .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
                 return site;
             }
             else
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index 7a95cc5c..6ec0fe11 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -31,7 +31,7 @@ namespace Oqtane.Controllers
             systeminfo.Add("osversion", Environment.OSVersion.ToString());
             systeminfo.Add("machinename", Environment.MachineName);
             systeminfo.Add("serverpath", _environment.ContentRootPath);
-            systeminfo.Add("servertime", DateTime.Now.ToString());
+            systeminfo.Add("servertime", DateTime.UtcNow.ToString());
             systeminfo.Add("installationid", _configManager.GetInstallationId());
 
             systeminfo.Add("runtime", _configManager.GetSetting("Runtime", "Server"));
diff --git a/Oqtane.Server/Controllers/UrlMappingController.cs b/Oqtane.Server/Controllers/UrlMappingController.cs
index d3a0ea53..9e8c745c 100644
--- a/Oqtane.Server/Controllers/UrlMappingController.cs
+++ b/Oqtane.Server/Controllers/UrlMappingController.cs
@@ -48,7 +48,7 @@ namespace Oqtane.Controllers
         public UrlMapping Get(int id)
         {
             var urlMapping = _urlMappings.GetUrlMapping(id);
-            if (urlMapping != null && (urlMapping.SiteId == _alias.SiteId))
+            if (urlMapping != null && urlMapping.SiteId == _alias.SiteId)
             {
                 return urlMapping;
             }
@@ -60,6 +60,23 @@ namespace Oqtane.Controllers
             }
         }
 
+        // GET api/<controller>/url/x?url=y
+        [HttpGet("url/{siteid}")]
+        public UrlMapping Get(int siteid, string url)
+        {            
+            var urlMapping = _urlMappings.GetUrlMapping(siteid, WebUtility.UrlDecode(url));
+            if (urlMapping != null && urlMapping.SiteId == _alias.SiteId)
+            {
+                return urlMapping;
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UrlMapping Get Attempt {SiteId} {Url}", siteid, url);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                return null;
+            }
+        }
+
         // POST api/<controller>
         [HttpPost]
         [Authorize(Roles = RoleNames.Admin)]
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index 6e92bc15..89efac3e 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -389,7 +389,7 @@ namespace Oqtane.Controllers
             if (ModelState.IsValid)
             {
                 IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
-                if (identityuser != null)
+                if (identityuser != null && !string.IsNullOrEmpty(token))
                 {
                     var result = await _identityUserManager.ConfirmEmailAsync(identityuser, token);
                     if (result.Succeeded)
@@ -398,13 +398,13 @@ namespace Oqtane.Controllers
                     }
                     else
                     {
-                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", user.Username);
+                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username} - Error {Error}", user.Username, result.Errors.ToString());
                         user = null;
                     }
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}", user.Username);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Email Verification Failed For {Username}And Token {Token}", user.Username, token);
                     user = null;
                 }
             }
@@ -420,9 +420,14 @@ namespace Oqtane.Controllers
                 IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
                 if (identityuser != null)
                 {
+                    user = _users.GetUser(user.Username);
                     string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
                     string url = HttpContext.Request.Scheme + "://" + _alias.Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
-                    string body = "Dear " + user.DisplayName + ",\n\nPlease Click The Link Displayed Below To Reset Your Password:\n\n" + url + "\n\nThank You!";
+                    string body = "Dear " + user.DisplayName + ",\n\nYou recently requested to reset your password. Please use the link below to complete the process:\n\n" + url +
+                        "\n\nPlease note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site." +
+                        "\n\nIf you did not request to reset your password you can safely ignore this message." +
+                        "\n\nThank You!";
+                 
                     var notification = new Notification(user.SiteId, null, user, "User Password Reset", body, null);
                     _notifications.AddNotification(notification);
                     _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", user.Username);
@@ -451,13 +456,13 @@ namespace Oqtane.Controllers
                     }
                     else
                     {
-                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", user.Username);
+                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username} - Error {Error}", user.Username, result.Errors.ToString());
                         user = null;
                     }
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username}", user.Username);
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Password Reset Failed For {Username} And Token {Token}", user.Username, token);
                     user = null;
                 }
             }
diff --git a/Oqtane.Server/Controllers/VisitorController.cs b/Oqtane.Server/Controllers/VisitorController.cs
index 3f789efd..dfb9a63c 100644
--- a/Oqtane.Server/Controllers/VisitorController.cs
+++ b/Oqtane.Server/Controllers/VisitorController.cs
@@ -47,15 +47,14 @@ namespace Oqtane.Controllers
         [HttpGet("{id}")]
         public Visitor Get(int id)
         {
-            bool authorized;
-            var visitorCookie = "APP_VISITOR_" + _alias.SiteId.ToString();
-            if (int.TryParse(Request.Cookies[visitorCookie], out int visitorId))
+            bool authorized = User.IsInRole(RoleNames.Admin);
+            if (!authorized)
             {
-                authorized = (visitorId == id);
-            }
-            else
-            {
-                authorized = User.IsInRole(RoleNames.Admin);
+                var visitorCookie = "APP_VISITOR_" + _alias.SiteId.ToString();
+                if (int.TryParse(Request.Cookies[visitorCookie], out int visitorId))
+                {
+                    authorized = (visitorId == id);
+                }
             }
 
             var visitor = _visitors.GetVisitor(id);
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index fa5a9029..cad82ac9 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -367,7 +367,9 @@ namespace Oqtane.Infrastructure
                             tenant = db.Tenant.FirstOrDefault(item => item.Name == install.TenantName);
                         }
 
-                        foreach (var aliasName in install.Aliases.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries))
+                        var aliasNames = install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray();
+                        var firstAlias = aliasNames[0];
+                        foreach (var aliasName in aliasNames)
                         {
                             if (tenant != null)
                             {
@@ -376,6 +378,7 @@ namespace Oqtane.Infrastructure
                                     Name = aliasName,
                                     TenantId = tenant.TenantId,
                                     SiteId = -1,
+                                    IsDefault = (aliasName == firstAlias),
                                     CreatedBy = "",
                                     CreatedOn = DateTime.UtcNow,
                                     ModifiedBy = "",
@@ -438,8 +441,7 @@ namespace Oqtane.Infrastructure
                         var index = Array.FindIndex(versions, item => item == version);
                         if (index != (versions.Length - 1))
                         {
-                            if (index == -1) index = 0;
-                            for (var i = index; i < versions.Length; i++)
+                            for (var i = (index + 1); i < versions.Length; i++)
                             {
                                 upgrades.Upgrade(tenant, versions[i]);
                             }
@@ -558,7 +560,8 @@ namespace Oqtane.Infrastructure
                     {
                         // set the alias explicitly so the tenant can be resolved
                         var aliases = scope.ServiceProvider.GetRequiredService<IAliasRepository>();
-                        var firstAlias = install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
+                        var aliasNames = install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray();
+                        var firstAlias = aliasNames[0];
                         var alias = aliases.GetAliases().FirstOrDefault(item => item.Name == firstAlias);
                         var tenantManager = scope.ServiceProvider.GetRequiredService<ITenantManager>();
                         tenantManager.SetAlias(alias);
@@ -650,7 +653,7 @@ namespace Oqtane.Infrastructure
                                 }
                             }
 
-                            foreach (var aliasName in install.Aliases.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                            foreach (var aliasName in aliasNames)
                             {
                                 alias = aliases.GetAliases().FirstOrDefault(item => item.Name == aliasName);
                                 if (alias != null)
diff --git a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
index 9e01968a..16140a09 100644
--- a/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
@@ -114,7 +114,12 @@ namespace Oqtane.Infrastructure
                                 jobLogs.UpdateJobLog(log);
 
                                 // update the job
-                                job.NextExecution = CalculateNextExecution(NextExecution, job.Frequency, job.Interval);
+                                job.NextExecution = CalculateNextExecution(NextExecution, job);
+                                if (job.Frequency == "O") // one time
+                                {
+                                    job.EndDate = DateTime.UtcNow;
+                                    job.NextExecution = null;
+                                }
                                 job.IsExecuting = false;
                                 jobs.UpdateJob(job);
 
@@ -140,21 +145,41 @@ namespace Oqtane.Infrastructure
 
         }
 
-        private DateTime CalculateNextExecution(DateTime nextExecution, string frequency, int interval)
+        private DateTime CalculateNextExecution(DateTime nextExecution, Job job)
         {
-            switch (frequency)
+            switch (job.Frequency)
             {
                 case "m": // minutes
-                    nextExecution = nextExecution.AddMinutes(interval);
+                    nextExecution = nextExecution.AddMinutes(job.Interval);
                     break;
                 case "H": // hours
-                    nextExecution = nextExecution.AddHours(interval);
+                    nextExecution = nextExecution.AddHours(job.Interval);
                     break;
                 case "d": // days
-                    nextExecution = nextExecution.AddDays(interval);
+                    nextExecution = nextExecution.AddDays(job.Interval);
+                    if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
+                    {
+                        // set the start time
+                        nextExecution = nextExecution.Date.Add(job.StartDate.Value.TimeOfDay);
+                    }
+                    break;
+                case "w": // weeks
+                    nextExecution = nextExecution.AddDays(job.Interval * 7);
+                    if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
+                    {
+                        // set the start time
+                        nextExecution = nextExecution.Date.Add(job.StartDate.Value.TimeOfDay);
+                    }
                     break;
                 case "M": // months
-                    nextExecution = nextExecution.AddMonths(interval);
+                    nextExecution = nextExecution.AddMonths(job.Interval);
+                    if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
+                    {
+                        // set the start time
+                        nextExecution = nextExecution.Date.Add(job.StartDate.Value.TimeOfDay);
+                    }
+                    break;
+                case "O": // one time
                     break;
             }
             if (nextExecution < DateTime.UtcNow)
@@ -168,7 +193,6 @@ namespace Oqtane.Infrastructure
         {
             try
             {
-                // set IsExecuting to false in case this job was forcefully terminated previously 
                 using (var scope = _serviceScopeFactory.CreateScope())
                 {
                     string jobTypeName = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName);
@@ -176,15 +200,17 @@ namespace Oqtane.Infrastructure
                     Job job = jobs.GetJobs().Where(item => item.JobType == jobTypeName).FirstOrDefault();
                     if (job != null)
                     {
+                        // reset in case this job was forcefully terminated previously 
                         job.IsStarted = true;
                         job.IsExecuting = false;
                         jobs.UpdateJob(job);
                     }
                     else
                     {
-                        // auto registration - does not run on initial installation but will run after restart
+                        // auto registration - job will not run on initial installation but will run after restart
                         job = new Job { JobType = jobTypeName };
-                        // optional properties
+
+                        // optional HostedServiceBase properties
                         var jobType = Type.GetType(jobTypeName);
                         var jobObject = ActivatorUtilities.CreateInstance(scope.ServiceProvider, jobType) as HostedServiceBase;
                         if (jobObject.Name != "")
@@ -203,6 +229,7 @@ namespace Oqtane.Infrastructure
                         job.IsEnabled = jobObject.IsEnabled;
                         job.IsStarted = true;
                         job.IsExecuting = false;
+                        job.NextExecution = null;
                         jobs.AddJob(job);
                     }
                 }
@@ -224,13 +251,27 @@ namespace Oqtane.Infrastructure
 
         public async Task StopAsync(CancellationToken cancellationToken)
         {
-            if (_executingTask == null)
-            {
-                return;
-            }
-
             try
             {
+                using (var scope = _serviceScopeFactory.CreateScope())
+                {
+                    string jobTypeName = Utilities.GetFullTypeName(GetType().AssemblyQualifiedName);
+                    IJobRepository jobs = scope.ServiceProvider.GetRequiredService<IJobRepository>();
+                    Job job = jobs.GetJobs().Where(item => item.JobType == jobTypeName).FirstOrDefault();
+                    if (job != null)
+                    {
+                        // reset job 
+                        job.IsStarted = false;
+                        job.IsExecuting = false;
+                        jobs.UpdateJob(job);
+                    }
+                }
+
+                if (_executingTask == null)
+                {
+                    return;
+                }
+
                 _cancellationTokenSource.Cancel();
             }
             finally
diff --git a/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs b/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs
new file mode 100644
index 00000000..a73bef98
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Models;
+using Oqtane.Repository;
+using Oqtane.Shared;
+
+namespace Oqtane.Infrastructure
+{
+    public class PurgeJob : HostedServiceBase
+    {
+        // JobType = "Oqtane.Infrastructure.PurgeJob, Oqtane.Server"
+
+        public PurgeJob(IServiceScopeFactory serviceScopeFactory) : base(serviceScopeFactory)
+        {
+            Name = "Purge Job";
+            Frequency = "d"; // daily
+            Interval = 1;
+            StartDate = DateTime.ParseExact("03:00", "H:mm", null, System.Globalization.DateTimeStyles.None); // 3 AM
+            IsEnabled = true;
+        }
+
+        // job is executed for each tenant in installation
+        public override string ExecuteJob(IServiceProvider provider)
+        {
+            string log = "";
+
+            // get services
+            var siteRepository = provider.GetRequiredService<ISiteRepository>();
+            var settingRepository = provider.GetRequiredService<ISettingRepository>();
+            var logRepository = provider.GetRequiredService<ILogRepository>();
+            var visitorRepository = provider.GetRequiredService<IVisitorRepository>();
+
+            // iterate through sites for current tenant
+            List<Site> sites = siteRepository.GetSites().ToList();
+            foreach (Site site in sites)
+            {
+                log += "Processing Site: " + site.Name + "<br />";
+                int retention;
+                int count;
+
+                // get site settings
+                Dictionary<string, string> settings = GetSettings(settingRepository.GetSettings(EntityNames.Site, site.SiteId).ToList());
+
+                // purge event log
+                retention = 30; // 30 days
+                if (settings.ContainsKey("LogRetention") && !string.IsNullOrEmpty(settings["LogRetention"]))
+                {
+                    retention = int.Parse(settings["LogRetention"]);
+                }
+                try
+                {
+                    count = logRepository.DeleteLogs(retention);
+                    log += count.ToString() + " Events Purged<br />";
+                }
+                catch (Exception ex)
+                {
+                    log += $"Error Purging Events - {ex.Message}<br />";
+                }
+
+                // purge visitors
+                if (site.VisitorTracking)
+                {
+                    retention = 30; // 30 days
+                    if (settings.ContainsKey("VisitorRetention") && !string.IsNullOrEmpty(settings["VisitorRetention"]))
+                    {
+                        retention = int.Parse(settings["VisitorRetention"]);
+                    }
+                    try
+                    {
+                        count = visitorRepository.DeleteVisitors(retention);
+                        log += count.ToString() + " Visitors Purged<br />";
+                    }
+                    catch (Exception ex)
+                    {
+                        log += $"Error Purging Visitors - {ex.Message}<br />";
+                    }
+                }
+            }
+
+            return log;
+        }
+
+        private Dictionary<string, string> GetSettings(List<Setting> settings)
+        {
+            Dictionary<string, string> dictionary = new Dictionary<string, string>();
+            foreach (Setting setting in settings.OrderBy(item => item.SettingName).ToList())
+            {
+                dictionary.Add(setting.SettingName, setting.SettingValue);
+            }
+            return dictionary;
+        }
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index ae03d057..13c0aa67 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -68,7 +68,7 @@ namespace Oqtane.SiteTemplates
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
                             new Permission(PermissionNames.Edit, RoleNames.Admin, true)
                         }.EncodePermissions(),
-                        Content = "<p>Copyright (c) 2019-2021 .NET Foundation</p>" +
+                        Content = "<p>Copyright (c) 2018-2022 .NET Foundation</p>" +
                         "<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>" +
                         "<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>" +
                         "<p>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>"
diff --git a/Oqtane.Server/Migrations/Master/03000201_AddAliasIsDefault.cs b/Oqtane.Server/Migrations/Master/03000201_AddAliasIsDefault.cs
new file mode 100644
index 00000000..e862878f
--- /dev/null
+++ b/Oqtane.Server/Migrations/Master/03000201_AddAliasIsDefault.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations.Master
+{
+    [DbContext(typeof(MasterDBContext))]
+    [Migration("Master.03.00.02.01")]
+    public class AddAliasIsDefault : MultiDatabaseMigration
+    {
+        public AddAliasIsDefault(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            //Add Column to Alias table
+            var aliasEntityBuilder = new AliasEntityBuilder(migrationBuilder, ActiveDatabase);
+            aliasEntityBuilder.AddBooleanColumn("IsDefault", true);
+            aliasEntityBuilder.UpdateColumn("IsDefault", "1", "bool", "");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var aliasEntityBuilder = new AliasEntityBuilder(migrationBuilder, ActiveDatabase);
+            aliasEntityBuilder.DropColumn("IsDefault");
+        }
+    }
+}
diff --git a/Oqtane.Server/Migrations/Tenant/03000201_UpdateSettingIsPublic.cs b/Oqtane.Server/Migrations/Tenant/03000201_UpdateSettingIsPublic.cs
new file mode 100644
index 00000000..7599ffd1
--- /dev/null
+++ b/Oqtane.Server/Migrations/Tenant/03000201_UpdateSettingIsPublic.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+using Oqtane.Shared;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.03.00.02.01")]
+    public class UpdateSettingIsPublic : MultiDatabaseMigration
+    {
+        public UpdateSettingIsPublic(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var settingEntityBuilder = new SettingEntityBuilder(migrationBuilder, ActiveDatabase);
+            settingEntityBuilder.UpdateColumn("IsPublic", "1", "bool", "SettingName NOT LIKE 'SMTP%'");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var settingEntityBuilder = new SettingEntityBuilder(migrationBuilder, ActiveDatabase);
+            settingEntityBuilder.UpdateColumn("IsPublic", "0", "bool", "SettingName NOT LIKE 'SMTP%'");
+        }
+    }
+}
diff --git a/Oqtane.Server/Migrations/Tenant/03000202_UpdateSettingIsPrivate.cs b/Oqtane.Server/Migrations/Tenant/03000202_UpdateSettingIsPrivate.cs
new file mode 100644
index 00000000..1d4f25c0
--- /dev/null
+++ b/Oqtane.Server/Migrations/Tenant/03000202_UpdateSettingIsPrivate.cs
@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+using Oqtane.Shared;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.03.00.02.02")]
+    public class UpdateSettingIsPrivate : MultiDatabaseMigration
+    {
+        public UpdateSettingIsPrivate(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var settingEntityBuilder = new SettingEntityBuilder(migrationBuilder, ActiveDatabase);
+            settingEntityBuilder.AddBooleanColumn("IsPrivate", true);
+            settingEntityBuilder.UpdateColumn("IsPrivate", "0", "bool", "");
+            settingEntityBuilder.UpdateColumn("IsPrivate", "1", "bool", "EntityName = 'Site' AND SettingName LIKE 'SMTP%'");
+            settingEntityBuilder.DropColumn("IsPublic");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // not implemented
+        }
+    }
+}
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 62ef77ac..6a53a3b8 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index b939f77a..9500a800 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -17,13 +17,11 @@
     <script src="js/app.js"></script>
     <script src="js/loadjs.min.js"></script>
     <link rel="stylesheet" href="css/app.css" />
-    @Html.Raw(@Model.HeadResources)
+    @Html.Raw(Model.HeadResources)
 </head>
 <body>
     @(Html.AntiForgeryToken())
-    <app>
-        <component type="typeof(Oqtane.App)" render-mode="@Model.RenderMode" param-AntiForgeryToken="@Model.AntiForgeryToken" param-Runtime="@Model.Runtime" param-RenderMode="@Model.RenderMode.ToString()" param-VisitorId="@Model.VisitorId" />
-    </app>
+    <component type="typeof(Oqtane.App)" render-mode="@Model.RenderMode" param-AntiForgeryToken="@Model.AntiForgeryToken" param-Runtime="@Model.Runtime" param-RenderMode="@Model.RenderMode.ToString()" param-VisitorId="@Model.VisitorId" />
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
@@ -48,8 +46,8 @@
     }
 	@if (!string.IsNullOrEmpty(Model.PWAScript))
 	{
-		@Model.PWAScript
+		@Html.Raw(Model.PWAScript)
 	}
-    @Html.Raw(@Model.BodyResources)
+    @Html.Raw(Model.BodyResources)
 </body>
 </html>
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index 8c878dc6..852b23dd 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -18,6 +18,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Net.Http.Headers;
 using Microsoft.AspNetCore.Http;
 using System.Security.Claims;
+using System.Net;
+using Microsoft.Extensions.Primitives;
 
 namespace Oqtane.Pages
 {
@@ -32,8 +34,10 @@ namespace Oqtane.Pages
         private readonly IPageRepository _pages;
         private readonly IUrlMappingRepository _urlMappings;
         private readonly IVisitorRepository _visitors;
+        private readonly IAliasRepository _aliases;
+        private readonly ISettingRepository _settings;
 
-        public HostModel(IConfiguration configuration, ITenantManager tenantManager, ILocalizationManager localizationManager, ILanguageRepository languages, IAntiforgery antiforgery, ISiteRepository sites, IPageRepository pages, IUrlMappingRepository urlMappings, IVisitorRepository visitors)
+        public HostModel(IConfiguration configuration, ITenantManager tenantManager, ILocalizationManager localizationManager, ILanguageRepository languages, IAntiforgery antiforgery, ISiteRepository sites, IPageRepository pages, IUrlMappingRepository urlMappings, IVisitorRepository visitors, IAliasRepository aliases, ISettingRepository settings)
         {
             _configuration = configuration;
             _tenantManager = tenantManager;
@@ -44,12 +48,15 @@ namespace Oqtane.Pages
             _pages = pages;
             _urlMappings = urlMappings;
             _visitors = visitors;
+            _aliases = aliases;
+            _settings = settings;
         }
 
         public string AntiForgeryToken = "";
         public string Runtime = "Server";
         public RenderMode RenderMode = RenderMode.Server;
         public int VisitorId = -1;
+        public string RemoteIPAddress = "";
         public string HeadResources = "";
         public string BodyResources = "";
         public string Title = "";
@@ -60,6 +67,7 @@ namespace Oqtane.Pages
         public IActionResult OnGet()
         {
             AntiForgeryToken = _antiforgery.GetAndStoreTokens(HttpContext).RequestToken;
+            RemoteIPAddress = HttpContext.Connection.RemoteIpAddress?.ToString() ?? "";
 
             if (_configuration.GetSection("Runtime").Exists())
             {
@@ -77,11 +85,30 @@ namespace Oqtane.Pages
                 var alias = _tenantManager.GetAlias();
                 if (alias != null)
                 {
-                    Route route = new Route(HttpContext.Request.GetEncodedUrl(), alias.Path);
+                    var url = WebUtility.UrlDecode(HttpContext.Request.GetEncodedUrl());
+
+                    // redirect non-default alias
+                    if (!alias.IsDefault)
+                    {
+                        var aliases = _aliases.GetAliases().Where(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId);
+                        if (aliases.Where(item => item.IsDefault).FirstOrDefault() != null)
+                        {
+                            return RedirectPermanent(url.Replace(alias.Name, aliases.Where(item => item.IsDefault).FirstOrDefault().Name));
+                        }
+                        else // no default specified - use first alias
+                        {
+                            if (alias.Name.Trim() != aliases.First().Name.Trim())
+                            {
+                                return RedirectPermanent(url.Replace(alias.Name, aliases.First().Name));
+                            }
+                        }
+                    }
 
                     var site = _sites.GetSite(alias.SiteId);
                     if (site != null)
                     {
+                        Route route = new Route(url, alias.Path);
+
                         if (!string.IsNullOrEmpty(site.Runtime))
                         {
                             Runtime = site.Runtime;
@@ -125,35 +152,14 @@ namespace Oqtane.Pages
                                 ThemeType = page.ThemeType;
                             }
                         }
-                        else
+                        else // page not found
                         {
-                            // page does not exist
-                            var url = route.SiteUrl + "/" + route.PagePath;
-                            var urlMapping = _urlMappings.GetUrlMapping(site.SiteId, url);
-                            if (urlMapping == null)
+                            // look for url mapping
+                            var urlMapping = _urlMappings.GetUrlMapping(site.SiteId, route.PagePath);
+                            if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
                             {
-                                if (site.CaptureBrokenUrls)
-                                {
-                                    urlMapping = new UrlMapping();
-                                    urlMapping.SiteId = site.SiteId;
-                                    urlMapping.Url = url;
-                                    urlMapping.MappedUrl = "";
-                                    urlMapping.Requests = 1;
-                                    urlMapping.CreatedOn = DateTime.UtcNow;
-                                    urlMapping.RequestedOn = DateTime.UtcNow;
-                                    _urlMappings.AddUrlMapping(urlMapping);
-                                }
-                            }
-                            else
-                            {
-                                urlMapping.Requests += 1;
-                                urlMapping.RequestedOn = DateTime.UtcNow;
-                                _urlMappings.UpdateUrlMapping(urlMapping);
-
-                                if (!string.IsNullOrEmpty(urlMapping.MappedUrl))
-                                {
-                                    return RedirectPermanent(urlMapping.MappedUrl);
-                                }
+                                url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl;
+                                return RedirectPermanent(url);
                             }
                         }
                     }
@@ -190,15 +196,27 @@ namespace Oqtane.Pages
         private void TrackVisitor(int SiteId)
         {
             // get request attributes
-            string ip = HttpContext.Connection.RemoteIpAddress.ToString();
-            string useragent = Request.Headers[HeaderNames.UserAgent];
-            string language = Request.Headers[HeaderNames.AcceptLanguage];
-            if (language.Contains(","))
+            string useragent = (Request.Headers[HeaderNames.UserAgent] != StringValues.Empty) ? Request.Headers[HeaderNames.UserAgent] : "";
+            string language = (Request.Headers[HeaderNames.AcceptLanguage] != StringValues.Empty) ? Request.Headers[HeaderNames.AcceptLanguage] : "";
+            language = (language.Contains(",")) ? language.Substring(0, language.IndexOf(",")) : language;
+            language = (language.Contains(";")) ? language.Substring(0, language.IndexOf(";")) : language;
+            language = (language.Trim().Length == 0) ? "??" : language;
+
+            // filter
+            var filter = _settings.GetSetting(EntityNames.Site, SiteId, "VisitorFilter");
+            if (filter != null && !string.IsNullOrEmpty(filter.SettingValue))
             {
-                language = language.Substring(0, language.IndexOf(","));
+                foreach (string term in filter.SettingValue.ToLower().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+                {
+                    if (RemoteIPAddress.ToLower().Contains(term) || useragent.ToLower().Contains(term) || language.ToLower().Contains(term))
+                    {
+                        return;
+                    }
+                }
             }
+
             string url = Request.GetEncodedUrl();
-            string referrer = Request.Headers[HeaderNames.Referer];
+            string referrer = (Request.Headers[HeaderNames.Referer] != StringValues.Empty) ? Request.Headers[HeaderNames.Referer] : "";
             int? userid = null;
             if (User.HasClaim(item => item.Type == ClaimTypes.PrimarySid))
             {
@@ -210,7 +228,7 @@ namespace Oqtane.Pages
             {
                 var visitor = new Visitor();
                 visitor.SiteId = SiteId;
-                visitor.IPAddress = ip;
+                visitor.IPAddress = RemoteIPAddress;
                 visitor.UserAgent = useragent;
                 visitor.Language = language;
                 visitor.Url = url;
@@ -236,7 +254,7 @@ namespace Oqtane.Pages
                 var visitor = _visitors.GetVisitor(VisitorId);
                 if (visitor != null)
                 {
-                    visitor.IPAddress = ip;
+                    visitor.IPAddress = RemoteIPAddress;
                     visitor.UserAgent = useragent;
                     visitor.Language = language;
                     visitor.Url = url;
@@ -262,7 +280,7 @@ namespace Oqtane.Pages
         private string CreatePWAScript(Alias alias, Site site, Route route)
         {
             return
-            "<script>" +
+            "<script id=\"app-pwa\">" +
                 "setTimeout(() => { " +
                     "var manifest = { " +
                         "\"name\": \"" + site.Name + "\", " +
@@ -287,6 +305,8 @@ namespace Oqtane.Pages
                     "document.getElementById('app-manifest').setAttribute('href', url); " +
                 "} " +
                 ", 1000);" +
+            "</script>" + Environment.NewLine +
+            "<script id=\"app-serviceworker\">" +
                 "if ('serviceWorker' in navigator) { " +
                     "navigator.serviceWorker.register('/service-worker.js').then(function(registration) { " +
                         "console.log('ServiceWorker Registration Successful'); " +
@@ -305,7 +325,7 @@ namespace Oqtane.Pages
                 var obj = Activator.CreateInstance(type) as IHostResources;
                 foreach (var resource in obj.Resources)
                 {
-                    ProcessResource(resource);
+                    ProcessResource(resource, 0);
                 }
             }
         }
@@ -325,7 +345,7 @@ namespace Oqtane.Pages
                     {
                         if (resource.Declaration == ResourceDeclaration.Global)
                         {
-                            ProcessResource(resource);
+                            ProcessResource(resource, 0);
                         }
                     }
                 }
@@ -343,24 +363,25 @@ namespace Oqtane.Pages
                 var obj = Activator.CreateInstance(type) as IThemeControl;
                 if (obj.Resources != null)
                 {
+                    int count = 0; // required for local stylesheets for current theme
                     foreach (var resource in obj.Resources)
                     {
                         if (resource.Declaration == ResourceDeclaration.Global || (Utilities.GetFullTypeName(type.AssemblyQualifiedName) == ThemeType && resource.ResourceType == ResourceType.Stylesheet))
                         {
-                            ProcessResource(resource);
+                            ProcessResource(resource, count++);
                         }
                     }
                 }
             }
         }
-        private void ProcessResource(Resource resource)
+        private void ProcessResource(Resource resource, int count)
         {
             switch (resource.ResourceType)
             {
                 case ResourceType.Stylesheet:
                     if (!HeadResources.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
                     {
-                        var id = (resource.Declaration == ResourceDeclaration.Global) ? "" : "id=\"app-stylesheet-" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "-00\" ";
+                        var id = (resource.Declaration == ResourceDeclaration.Global) ? "" : "id=\"app-stylesheet-" + DateTime.UtcNow.ToString("yyyyMMddHHmmssfff") + "-" + count.ToString("00") + "\" ";
                         HeadResources += "<link " + id + "rel=\"stylesheet\" href=\"" + resource.Url + "\"" + CrossOrigin(resource.CrossOrigin) + Integrity(resource.Integrity) + " />" + Environment.NewLine;
                     }
                     break;
diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs
index 9e4e82d9..b7aa8b9a 100644
--- a/Oqtane.Server/Repository/AliasRepository.cs
+++ b/Oqtane.Server/Repository/AliasRepository.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Oqtane.Models;
+using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
@@ -72,7 +73,7 @@ namespace Oqtane.Repository
             int start = segments.Length;
             for (int i = 0; i < segments.Length; i++)
             {
-                if (segments[i] == "api" || segments[i] == "pages" || segments[i] == "*")
+                if (segments[i] == "api" || segments[i] == "pages" || segments[i] == Constants.ModuleDelimiter)
                 {
                     start = i;
                     break;
@@ -89,8 +90,18 @@ namespace Oqtane.Repository
                 }
             }
 
-            // return fallback alias if none found
-            return alias ?? aliases.Find(item => item.Name.Equals("*"));
+            // auto register alias if there is only a single tenant/site
+            if (alias == null && aliases.Select(item => new { item.TenantId, item.SiteId }).Distinct().Count() == 1)
+            {
+                alias = new Alias();
+                alias.TenantId = aliases.First().TenantId;
+                alias.SiteId = aliases.First().SiteId;
+                alias.Name = url;
+                alias.IsDefault = false;
+                alias = AddAlias(alias);
+            }
+
+            return alias;
         }
 
         public void DeleteAlias(int aliasId)
diff --git a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
index 27752a03..cc2c8aae 100644
--- a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -8,5 +8,6 @@ namespace Oqtane.Repository
         IEnumerable<Log> GetLogs(int siteId, string level, string function, int rows);
         Log GetLog(int logId);
         void AddLog(Log log);
+        int DeleteLogs(int age);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
index 89f04da7..5c231806 100644
--- a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
@@ -10,6 +10,8 @@ namespace Oqtane.Repository
         Setting AddSetting(Setting setting);
         Setting UpdateSetting(Setting setting);
         Setting GetSetting(string entityName, int settingId);
+        Setting GetSetting(string entityName, int entityId, string settingName);
         void DeleteSetting(string entityName, int settingId);
+        void DeleteSettings(string entityName, int entityId);
     }
 }
diff --git a/Oqtane.Server/Repository/Interfaces/IVisitorRepository.cs b/Oqtane.Server/Repository/Interfaces/IVisitorRepository.cs
index d50ceec2..3b05ba90 100644
--- a/Oqtane.Server/Repository/Interfaces/IVisitorRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/IVisitorRepository.cs
@@ -11,5 +11,6 @@ namespace Oqtane.Repository
         Visitor UpdateVisitor(Visitor visitor);
         Visitor GetVisitor(int visitorId);
         void DeleteVisitor(int visitorId);
+        int DeleteVisitors(int age);
     }
 }
diff --git a/Oqtane.Server/Repository/LogRepository.cs b/Oqtane.Server/Repository/LogRepository.cs
index 1bcbc2be..24920d42 100644
--- a/Oqtane.Server/Repository/LogRepository.cs
+++ b/Oqtane.Server/Repository/LogRepository.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Oqtane.Models;
 
@@ -47,5 +48,23 @@ namespace Oqtane.Repository
             _db.Log.Add(log);
             _db.SaveChanges();
         }
+
+        public int DeleteLogs(int age)
+        {
+            // delete logs in batches of 100 records
+            int count = 0;
+            var purgedate = DateTime.UtcNow.AddDays(-age);
+            var logs = _db.Log.Where(item => item.Level != "Error" && item.LogDate < purgedate)
+                .OrderBy(item => item.LogDate).Take(100).ToList();
+            while (logs.Count > 0)
+            {
+                count += logs.Count;
+                _db.Log.RemoveRange(logs);
+                _db.SaveChanges();
+                logs = _db.Log.Where(item => item.Level != "Error" && item.LogDate < purgedate)
+                    .OrderBy(item => item.LogDate).Take(100).ToList();
+            }
+            return count;
+        }
     }
 }
diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs
index 922dfb5d..9637c4d1 100644
--- a/Oqtane.Server/Repository/ModuleRepository.cs
+++ b/Oqtane.Server/Repository/ModuleRepository.cs
@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Models;
 using Oqtane.Modules;
+using Oqtane.Shared;
 using Module = Oqtane.Models.Module;
 
 namespace Oqtane.Repository
@@ -14,13 +15,15 @@ namespace Oqtane.Repository
     {
         private TenantDBContext _db;
         private readonly IPermissionRepository _permissions;
+        private readonly ISettingRepository _settings;
         private readonly IModuleDefinitionRepository _moduleDefinitions;
         private readonly IServiceProvider _serviceProvider;
 
-        public ModuleRepository(TenantDBContext context, IPermissionRepository permissions, IModuleDefinitionRepository moduleDefinitions, IServiceProvider serviceProvider)
+        public ModuleRepository(TenantDBContext context, IPermissionRepository permissions, ISettingRepository settings, IModuleDefinitionRepository moduleDefinitions, IServiceProvider serviceProvider)
         {
             _db = context;
             _permissions = permissions;
+            _settings = settings;
             _moduleDefinitions = moduleDefinitions;
             _serviceProvider = serviceProvider;
         }
@@ -34,7 +37,7 @@ namespace Oqtane.Repository
         {
             _db.Module.Add(module);
             _db.SaveChanges();
-            _permissions.UpdatePermissions(module.SiteId, "Module", module.ModuleId, module.Permissions);
+            _permissions.UpdatePermissions(module.SiteId, EntityNames.Module, module.ModuleId, module.Permissions);
             return module;
         }
 
@@ -42,7 +45,7 @@ namespace Oqtane.Repository
         {
             _db.Entry(module).State = EntityState.Modified;
             _db.SaveChanges();
-            _permissions.UpdatePermissions(module.SiteId, "Module", module.ModuleId, module.Permissions);
+            _permissions.UpdatePermissions(module.SiteId, EntityNames.Module, module.ModuleId, module.Permissions);
             return module;
         }
 
@@ -64,7 +67,7 @@ namespace Oqtane.Repository
             }
             if (module != null)
             {
-                module.Permissions = _permissions.GetPermissionString("Module", module.ModuleId);
+                module.Permissions = _permissions.GetPermissionString(EntityNames.Module, module.ModuleId);
             }
             return module;
         }
@@ -72,7 +75,8 @@ namespace Oqtane.Repository
         public void DeleteModule(int moduleId)
         {
             Module module = _db.Module.Find(moduleId);
-            _permissions.DeletePermissions(module.SiteId, "Module", moduleId);
+            _permissions.DeletePermissions(module.SiteId, EntityNames.Module, moduleId);
+            _settings.DeleteSettings(EntityNames.Module, moduleId);
             _db.Module.Remove(module);
             _db.SaveChanges();
         }
diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs
index 4d1e00b6..95b55de6 100644
--- a/Oqtane.Server/Repository/SettingRepository.cs
+++ b/Oqtane.Server/Repository/SettingRepository.cs
@@ -77,6 +77,18 @@ namespace Oqtane.Repository
             }
         }
 
+        public Setting GetSetting(string entityName, int entityId, string settingName)
+        {
+            if (IsMaster(entityName))
+            {
+                return _master.Setting.Where(item => item.EntityName == entityName && item.EntityId == entityId && item.SettingName == settingName).FirstOrDefault();
+            }
+            else
+            {
+                return _tenant.Setting.Where(item => item.EntityName == entityName && item.EntityId == entityId && item.SettingName == settingName).FirstOrDefault();
+            }
+        }
+
         public void DeleteSetting(string entityName, int settingId)
         {
             if (IsMaster(entityName))
@@ -93,6 +105,32 @@ namespace Oqtane.Repository
             }
         }
 
+        public void DeleteSettings(string entityName, int entityId)
+        {
+            if (IsMaster(entityName))
+            {
+                IEnumerable<Setting> settings = _master.Setting
+                    .Where(item => item.EntityName == entityName)
+                    .Where(item => item.EntityId == entityId);
+                foreach (Setting setting in settings)
+                {
+                    _master.Setting.Remove(setting);
+                }
+                _master.SaveChanges();
+            }
+            else
+            {
+                IEnumerable<Setting> settings = _tenant.Setting
+                    .Where(item => item.EntityName == entityName)
+                    .Where(item => item.EntityId == entityId);
+                foreach (Setting setting in settings)
+                {
+                    _tenant.Setting.Remove(setting);
+                }
+                _tenant.SaveChanges();
+            }
+        }
+
         private bool IsMaster(string EntityName)
         {
             return (EntityName == EntityNames.ModuleDefinition || EntityName == EntityNames.Host);
diff --git a/Oqtane.Server/Repository/UrlMappingRepository.cs b/Oqtane.Server/Repository/UrlMappingRepository.cs
index 306d8f69..debb3a2f 100644
--- a/Oqtane.Server/Repository/UrlMappingRepository.cs
+++ b/Oqtane.Server/Repository/UrlMappingRepository.cs
@@ -9,12 +9,14 @@ namespace Oqtane.Repository
     public class UrlMappingRepository : IUrlMappingRepository
     {
         private TenantDBContext _db;
+        private readonly ISiteRepository _sites;
 
-        public UrlMappingRepository(TenantDBContext context)
+        public UrlMappingRepository(TenantDBContext context, ISiteRepository sites)
         {
             _db = context;
+            _sites = sites;
         }
-            
+
         public IEnumerable<UrlMapping> GetUrlMappings(int siteId, bool isMapped)
         {
             if (isMapped)
@@ -60,7 +62,29 @@ namespace Oqtane.Repository
 
         public UrlMapping GetUrlMapping(int siteId, string url)
         {
-            return _db.UrlMapping.Where(item => item.SiteId == siteId && item.Url == url).FirstOrDefault();
+            var urlMapping = _db.UrlMapping.Where(item => item.SiteId == siteId && item.Url == url).FirstOrDefault();
+            if (urlMapping == null)
+            {
+                var site = _sites.GetSite(siteId);
+                if (site.CaptureBrokenUrls)
+                {
+                    urlMapping = new UrlMapping();
+                    urlMapping.SiteId = siteId;
+                    urlMapping.Url = url;
+                    urlMapping.MappedUrl = "";
+                    urlMapping.Requests = 1;
+                    urlMapping.CreatedOn = DateTime.UtcNow;
+                    urlMapping.RequestedOn = DateTime.UtcNow;
+                    urlMapping = AddUrlMapping(urlMapping);
+                }
+            }
+            else
+            {
+                urlMapping.Requests += 1;
+                urlMapping.RequestedOn = DateTime.UtcNow;
+                urlMapping = UpdateUrlMapping(urlMapping);
+            }
+            return urlMapping;
         }
 
         public void DeleteUrlMapping(int urlMappingId)
diff --git a/Oqtane.Server/Repository/VisitorRepository.cs b/Oqtane.Server/Repository/VisitorRepository.cs
index 254c48e7..6572d973 100644
--- a/Oqtane.Server/Repository/VisitorRepository.cs
+++ b/Oqtane.Server/Repository/VisitorRepository.cs
@@ -47,5 +47,23 @@ namespace Oqtane.Repository
             _db.Visitor.Remove(visitor);
             _db.SaveChanges();
         }
+
+        public int DeleteVisitors(int age)
+        {
+            // delete visitors in batches of 100 records
+            int count = 0;
+            var purgedate = DateTime.UtcNow.AddDays(-age);
+            var visitors = _db.Visitor.Where(item => item.Visits <= 1 && item.VisitedOn < purgedate)
+                .OrderBy(item => item.VisitedOn).Take(100).ToList();
+            while (visitors.Count > 0)
+            {
+                count += visitors.Count;
+                _db.Visitor.RemoveRange(visitors);
+                _db.SaveChanges();
+                visitors = _db.Visitor.Where(item => item.Visits < 2 && item.VisitedOn < purgedate)
+                    .OrderBy(item => item.VisitedOn).Take(100).ToList();
+            }
+            return count;
+        }
     }
 }
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index cf8bf6a2..eb6a26a2 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -15,6 +15,7 @@ using Oqtane.Models;
 using Oqtane.Repository;
 using Oqtane.Security;
 using Oqtane.Shared;
+using Microsoft.AspNetCore.HttpOverrides;
 
 namespace Oqtane
 {
@@ -49,7 +50,13 @@ namespace Oqtane
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            // Register localization services
+            // process forwarded headers on load balancers and proxy servers
+            services.Configure<ForwardedHeadersOptions>(options =>
+            {
+                options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+            });
+
+            // register localization services
             services.AddLocalization(options => options.ResourcesPath = "Resources");
 
             services.AddOptions<List<Database>>().Bind(Configuration.GetSection(SettingKeys.AvailableDatabasesSection));
@@ -111,7 +118,6 @@ namespace Oqtane
             services.AddOqtane(_runtime, _supportedCultures);
             services.AddOqtaneDbContext();
 
-
             services.AddMvc()
                 .AddNewtonsoftJson()
                 .AddOqtaneApplicationParts() // register any Controllers from custom modules
@@ -133,9 +139,11 @@ namespace Oqtane
             {
                 app.UseDeveloperExceptionPage();
                 app.UseWebAssemblyDebugging();
+                app.UseForwardedHeaders();
             }
             else
             {
+                app.UseForwardedHeaders();
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
                 app.UseHsts();
             }
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak
index 36fee374..461409ed 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak
index 560e1632..a99a0724 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak
index 0bb676b2..859f8844 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak
index 7c2768af..ad6c9b2a 100644
Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak differ
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
index 668d7fd3..1803da00 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
@@ -137,7 +137,7 @@
         position: fixed;
         left: 275px;
         top: 15px;
-        z-index: 3
+        z-index: 6
     }
 
     .sidebar {
@@ -145,13 +145,13 @@
         height: 100vh;
         position: sticky;
         top: 0;
-        z-index: 1
+        z-index: 4
     }
 
     .main .top-row {
         position: sticky;
         top: 0;
-        z-index: 2
+        z-index: 5
     }
 
     .main > div {
@@ -207,18 +207,18 @@
         top: 150px;
         width: 100%;
         left: 0;
-        z-index: 1;
+        z-index: 4;
     }
 
     .sidebar {
         margin-top: 3.5rem;
         position: fixed;
         width: 100%;
-        z-index: 2;
+        z-index: 4;
     }
 
     .main .top-row {
-        z-index: 2;
+        z-index: 4;
     }
 
     .main > .top-row.px-4 {
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 0db5c13e..e4e07e8e 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -369,5 +369,12 @@ Oqtane.Interop = {
         if (element !== null) {
             element.setAttribute(attribute, value);
         }
+    },
+    scrollTo: function (top, left, behavior) {
+        window.scrollTo({
+            top: top,
+            left: left,
+            behavior: behavior
+        });
     }
 };
diff --git a/Oqtane.Shared/Models/Alias.cs b/Oqtane.Shared/Models/Alias.cs
index 0afad7d2..229fde44 100644
--- a/Oqtane.Shared/Models/Alias.cs
+++ b/Oqtane.Shared/Models/Alias.cs
@@ -30,6 +30,11 @@ namespace Oqtane.Models
         /// </summary>
         public int SiteId { get; set; }
 
+        /// <summary>
+        /// Specifies if the alias is the default for the tenant/site. Requests for non-default aliases are redirected to the default alias.
+        /// </summary>
+        public bool IsDefault { get; set; }
+
         /// <inheritdoc />
         public string CreatedBy { get; set; }
 
@@ -62,5 +67,6 @@ namespace Oqtane.Models
                 }
             }
         }
+
     }
 }
diff --git a/Oqtane.Shared/Models/Route.cs b/Oqtane.Shared/Models/Route.cs
index a41d4f46..bff8f17f 100644
--- a/Oqtane.Shared/Models/Route.cs
+++ b/Oqtane.Shared/Models/Route.cs
@@ -30,7 +30,7 @@ namespace Oqtane.Models
             Action = "";
             UrlParameters = "";
 
-            if (AliasPath.Length != 0)
+            if (AliasPath.Length != 0 && PagePath.StartsWith("/" + AliasPath))
             {
                 PagePath = PagePath.Substring(AliasPath.Length + 1);
             }
diff --git a/Oqtane.Shared/Models/Setting.cs b/Oqtane.Shared/Models/Setting.cs
index 37d72dbe..4b3c66b0 100644
--- a/Oqtane.Shared/Models/Setting.cs
+++ b/Oqtane.Shared/Models/Setting.cs
@@ -33,9 +33,9 @@ namespace Oqtane.Models
         public string SettingValue { get; set; }
 
         /// <summary>
-        /// Indicates if this setting is publicly available - only applicable to Site Settings as other entities have more granular permissions
+        /// Indicates if this setting is private - indicating it should be maintained on the server and not sent to the client
         /// </summary>
-        public bool IsPublic { get; set; }
+        public bool IsPrivate { get; set; }
 
         #region IAuditable Properties
 
diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj
index 95e24196..3fa5969d 100644
--- a/Oqtane.Shared/Oqtane.Shared.csproj
+++ b/Oqtane.Shared/Oqtane.Shared.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index eef3e4e1..0085b45f 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -3,8 +3,8 @@ using System;
 namespace Oqtane.Shared {
 
     public class Constants {
-        public static readonly string Version = "3.0.1";
-        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1";
+        public static readonly string Version = "3.0.2";
+        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2";
         public const string PackageId = "Oqtane.Framework";
         public const string UpdaterPackageId = "Oqtane.Updater";
         public const string PackageRegistryUrl = "https://www.oqtane.net";
diff --git a/Oqtane.Shared/Shared/SiteState.cs b/Oqtane.Shared/Shared/SiteState.cs
index 475a9d59..67d5cbd8 100644
--- a/Oqtane.Shared/Shared/SiteState.cs
+++ b/Oqtane.Shared/Shared/SiteState.cs
@@ -7,6 +7,6 @@ namespace Oqtane.Shared
     {
         public Alias Alias { get; set; }
         public string AntiForgeryToken { get; set; } // for use in client services
-
+        public string RemoteIPAddress { get; set; } // captured in _host as cannot be reliably retrieved on Blazor Server
     }
 }
diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index 1ac3f900..89b33341 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -1,7 +1,6 @@
 using Oqtane.Models;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -107,25 +106,28 @@ namespace Oqtane.Shared
         public static string ContentUrl(Alias alias, int fileId, bool asAttachment)
         {
             var aliasUrl = (alias != null && !string.IsNullOrEmpty(alias.Path)) ? "/" + alias.Path : "";
-            var method = asAttachment ? "/attach":"";
+            var method = asAttachment ? "/attach" : "";
 
             return $"{aliasUrl}{Constants.ContentUrl}{fileId}{method}";
         }
 
         public static string ImageUrl(Alias alias, int fileId, int width, int height, string mode)
         {
-            return ImageUrl(alias, fileId, width, height, mode, 0);
+            return ImageUrl(alias, fileId, width, height, mode, "", "", 0, false);
         }
 
-        public static string ImageUrl(Alias alias, int fileId, int width, int height, string mode, int rotate)
+        public static string ImageUrl(Alias alias, int fileId, int width, int height, string mode, string position, string background, int rotate, bool recreate)
         {
             var aliasUrl = (alias != null && !string.IsNullOrEmpty(alias.Path)) ? "/" + alias.Path : "";
-            return $"{aliasUrl}{Constants.ImageUrl}{fileId}/{width}/{height}/{mode}/{rotate}";
+            mode = string.IsNullOrEmpty(mode) ? "crop" : mode;
+            position = string.IsNullOrEmpty(position) ? "center" : position;
+            background = string.IsNullOrEmpty(background) ? "000000" : background;
+            return $"{aliasUrl}{Constants.ImageUrl}{fileId}/{width}/{height}/{mode}/{position}/{background}/{rotate}/{recreate}";
         }
 
         public static string TenantUrl(Alias alias, string url)
         {
-            url = (!url.StartsWith("/")) ? "/" + url : url; 
+            url = (!url.StartsWith("/")) ? "/" + url : url;
             return (alias != null && !string.IsNullOrEmpty(alias.Path)) ? "/" + alias.Path + url : url;
         }
 
diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj
index 30553a83..51384d44 100644
--- a/Oqtane.Test/Oqtane.Test.csproj
+++ b/Oqtane.Test/Oqtane.Test.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/Oqtane.Updater/Oqtane.Updater.csproj b/Oqtane.Updater/Oqtane.Updater.csproj
index 9d069c0a..bfb34328 100644
--- a/Oqtane.Updater/Oqtane.Updater.csproj
+++ b/Oqtane.Updater/Oqtane.Updater.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
diff --git a/README.md b/README.md
index 03a987a4..913c7e25 100644
--- a/README.md
+++ b/README.md
@@ -58,14 +58,26 @@ There is a separate [Documentation repository](https://github.com/oqtane/oqtane.
 This project is a work in progress and the schedule for implementing enhancements is dependent upon the availability of community members who are willing/able to assist.
 
 Backlog (Not Yet Assigned)
-- [ ] Enhance alias concept with a tabular UI and additional configuration properties
 - [ ] Allow language specification in Url (#1731)
 
-V.3.1.0 ( Q4 2021 )
-- [ ] Token based authenticaton / authorization via OAuth2 / OpenID Connect
+V.3.1.0 ( Q1 2022 )
+- [ ] Token based authentication / authorization via OAuth2 / OpenID Connect
 - [ ] Provide Single Sign On (SSO) for other applications
 - [ ] Authentication extensibility via Social logins / Azure B2C
 - [ ] Allow configuration of password complexity for local authentication
+- [ ] User account lockout support
+
+V.3.0.2 ( Jan 16, 2022 )
+- [x] Default alias specification, auto alias registration, redirect logic
+- [x] Improvements to visitor tracking and url mapping
+- [x] Scheduler enhancements for stop/start, weekly and one-time jobs
+- [x] Purge job for daily housekeeping of event log and visitors 
+- [x] Granular security filtering for Settings 
+
+V.3.0.1 ( Dec 12, 2021 )
+- [x] Url mapping for broken links, content migration
+- [x] Visitor tracking for usage insights, personalization
+- [x] User experience improvements in Page and Module management
 
 V.3.0.0 ( Nov 11, 2021 )
 - [x] Migration to .NET 6
@@ -145,6 +157,12 @@ Oqtane was created by [Shaun Walker](https://www.linkedin.com/in/shaunbrucewalke
 
 [Oqtane POC](https://www.oqtane.org/Resources/Blog/PostId/520/announcing-oqtane-a-modular-application-framework-for-blazor)
 
+# Reference Implementations
+
+[Built On Blazor!](https://builtonblazor.net) - a showcase of sites built on Blazor
+
+[.NET Foundation Project Trends](https://www.dnfprojects.com) - tracks the most active .NET Foundation open source projects based on GitHub activity
+
 # Architecture
 
 The following diagram visualizes the client and server components in the Oqtane architecture.