From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 6 Nov 2021 19:59:44 +0000 (+0100)
Subject: baculum: Visual improvements in interface
X-Git-Tag: Release-11.3.2~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bfefb2fcfe13a1586e887cb94de5b17002cab77;p=thirdparty%2Fbacula.git

baculum: Visual improvements in interface

Changes:
 - Unify wizards interface
 - Align all doc buttons
 - Button style improvement
 - Reduce size of directive fields
 - General styling
---

diff --git a/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page b/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page
index 3b4dec135..a1da7fa45 100644
--- a/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page
+++ b/gui/baculum/protected/Web/Pages/NewBackupJobWizard.page
@@ -138,33 +138,41 @@
 				<p><%[ This wizard enables you to create in easy way a new backup job. ]%></p>
 				<!--p><%[ To start please select job type that you wish to create. ]%></p-->
 			</div>
-			<div class="w3-container w3-margin-top">
-				<com:Application.Web.Portlets.DirectiveTextBox
-					ID="Name"
-					DirectiveName="Name"
-					Label="Job Name"
-					ValidationGroup="NewJobDirective"
-					Required="true"
-					Show="true"
-					/>
-			</div>
-			<div class="w3-container w3-margin-top">
-				<com:Application.Web.Portlets.DirectiveTextBox
-					ID="Description"
-					DirectiveName="Description"
-					Label="Description"
-					ValidationGroup="NewJobDirective"
-					Required="false"
-					Show="true"
-					/>
-			</div>
-			<div class="w3-container w3-margin-top">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="JobDefs"
-					DirectiveName="JobDefs"
-					Label="JobDefs"
-					Show="true"
-					/>
+			<div class="w3-half" style="float: none; margin: auto">
+				<div class="w3-container w3-margin-top">
+					<com:Application.Web.Portlets.DirectiveTextBox
+						ID="Name"
+						DirectiveName="Name"
+						Label="Job Name"
+						ValidationGroup="NewJobDirective"
+						Required="true"
+						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+				</div>
+				<div class="w3-container w3-margin-top">
+					<com:Application.Web.Portlets.DirectiveTextBox
+						ID="Description"
+						DirectiveName="Description"
+						Label="Description"
+						ValidationGroup="NewJobDirective"
+						Required="false"
+						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+				</div>
+				<div class="w3-container w3-margin-top">
+					<com:Application.Web.Portlets.DirectiveComboBox
+						ID="JobDefs"
+						DirectiveName="JobDefs"
+						Label="JobDefs"
+						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+				</div>
 			</div>
 		</com:TWizardStep>
 		<com:TWizardStep ID="Step2" Title="<%[ Step 2 - what you want to backup ]%>" StepType="Auto">
@@ -173,40 +181,46 @@
 				<p><%[ Please select Client from which you want to backup data and please select FileSet with files/directories definition to backup. ]%></p>
 				<p><%[ If your FileSet for this backup does not exist yet, you can create it. ]%></p>
 			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="Client"
-					DirectiveName="Client"
-					Label="Client"
-					Show="true"
-					ValidationGroup="NewJobDirective"
-					Required="true"
-					/>
-			</div>
-			<div class="w3-container w3-margin-top">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="Fileset"
-					DirectiveName="Fileset"
-					Label="FileSet"
-					Show="true"
-					ValidationGroup="NewJobDirective"
-					Required="true"
+			<div class="w3-half" style="float: none; margin: auto">
+				<div class="w3-container">
+					<com:Application.Web.Portlets.DirectiveComboBox
+						ID="Client"
+						DirectiveName="Client"
+						Label="Client"
+						Show="true"
+						ValidationGroup="NewJobDirective"
+						Required="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+				</div>
+				<div class="w3-container w3-margin-top">
+					<com:Application.Web.Portlets.DirectiveComboBox
+						ID="Fileset"
+						DirectiveName="Fileset"
+						Label="FileSet"
+						Show="true"
+						ValidationGroup="NewJobDirective"
+						Required="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+					<span><a href="javascript:void(0)" onclick="$('#job_wizard_new_fileset').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green" ><i class="fa fa-plus"></i> &nbsp;<%[ Add new FileSet ]%></a></span>
+				</div>
+				<div id="fileset_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
+					<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
+					<p><%[ The resource has been created successfully. ]%></p>
+				</div>
+				<div id="job_wizard_new_fileset" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+					<h3><%[ New FileSet ]%></h3>
+					<com:Application.Web.Portlets.BaculaConfigDirectives
+						ID="FilesetConfig"
+						ComponentType="dir"
+						ResourceType="Fileset"
+						ShowCancelButton="false"
+						SaveDirectiveActionOk="$('#job_wizard_new_fileset').slideUp(); set_new_fileset(); $('#fileset_save_ok').show();"
 					/>
-				<span><a href="javascript:void(0)" onclick="$('#job_wizard_new_fileset').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green" ><i class="fa fa-plus"></i> &nbsp;<%[ Add new FileSet ]%></a></span>
-			</div>
-			<div id="fileset_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
-				<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
-				<p><%[ The resource has been created successfully. ]%></p>
-			</div>
-			<div id="job_wizard_new_fileset" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-				<h3><%[ New FileSet ]%></h3>
-				<com:Application.Web.Portlets.BaculaConfigDirectives
-					ID="FilesetConfig"
-					ComponentType="dir"
-					ResourceType="Fileset"
-					ShowCancelButton="false"
-					SaveDirectiveActionOk="$('#job_wizard_new_fileset').slideUp(); set_new_fileset(); $('#fileset_save_ok').show();"
-				/>
+				</div>
 			</div>
 			<com:TCallback ID="LoadFilesetList" OnCallback="LoadFilesetList" />
 			<script type="text/javascript">
@@ -224,95 +238,113 @@
 				<h2><%[ Storage and Pool ]%></h2>
 				<p><%[ Please select Storage where you want to backup data and please select Pool with volumes which Storage will use to store backup data. ]%></p>
 			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="Storage"
-					DirectiveName="Storage"
-					Label="Storage"
-					Show="true"
-					ValidationGroup="NewJobDirective"
-					Required="true"
-					/>
-				<span><a href="javascript:void(0)" onclick="$('#job_wizard_storage_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Storage directives for Job ]%></a></span>
-			</div>
-			<div id="job_wizard_storage_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-				<h3><%[ Spool setting ]%></h3>
-				<div class="w3-container">
-					<com:Application.Web.Portlets.DirectiveCheckBox
-						ID="SpoolData"
-						DirectiveName="SpoolData"
-						Label="Spool Data"
-						Show="true"
-						 />
-				</div>
-				<div class="w3-container">
-					<com:Application.Web.Portlets.DirectiveCheckBox
-						ID="SpoolAttributes"
-						DirectiveName="SpoolAttributes"
-						Label="Spool Attributes"
-						Show="true"
-						 />
-				</div>
-				<div class="w3-container">
-					<com:Application.Web.Portlets.DirectiveSize
-						ID="SpoolSize"
-						DirectiveName="SpoolSize"
-						Label="Spool Size"
-						Show="true"
-						/>
-				</div>
-			</div>
-			<div class="w3-container w3-margin-top">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="Pool"
-					DirectiveName="Pool"
-					Label="Pool"
-					Show="true"
-					ValidationGroup="NewJobDirective"
-					Required="true"
-					 />
-				<span><a href="javascript:void(0)" onclick="$('#job_wizard_pool_directives').hide(); $('#job_wizard_new_pool').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Pool ]%></a></span>
-				<span><a href="javascript:void(0)" onclick="$('#job_wizard_new_pool').hide(); $('#job_wizard_pool_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Pool directives for Job ]%></a></span>
-			</div>
-			<div id="pool_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
-				<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
-				<p><%[ The resource has been created successfully. ]%></p>
-			</div>
-			<div id="job_wizard_new_pool" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-				<h3><%[ New Pool ]%></h3>
-				<com:Application.Web.Portlets.BaculaConfigDirectives
-					ID="PoolConfig"
-					ComponentType="dir"
-					ResourceType="Pool"
-					ShowCancelButton="false"
-					SaveDirectiveActionOk="$('#job_wizard_new_pool').slideUp(); set_new_pool(); $('#pool_save_ok').show();"
-				/>
-			</div>
-			<div id="job_wizard_pool_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-				<h3><%[ Pool setting ]%></h3>
+			<div class="w3-half" style="float: none; margin: auto">
 				<div class="w3-container">
 					<com:Application.Web.Portlets.DirectiveComboBox
-						ID="FullBackupPool"
-						DirectiveName="FullBackupPool"
-						Label="Full Backup Pool"
+						ID="Storage"
+						DirectiveName="Storage"
+						Label="Storage"
 						Show="true"
+						ValidationGroup="NewJobDirective"
+						Required="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
 						/>
+					<span><a href="javascript:void(0)" onclick="$('#job_wizard_storage_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Storage directives for Job ]%></a></span>
+				</div>
+				<div id="job_wizard_storage_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+					<h3><%[ Spool setting ]%></h3>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveCheckBox
+							ID="SpoolData"
+							DirectiveName="SpoolData"
+							Label="Spool Data"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							 />
+					</div>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveCheckBox
+							ID="SpoolAttributes"
+							DirectiveName="SpoolAttributes"
+							Label="Spool Attributes"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							 />
+					</div>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveSize
+							ID="SpoolSize"
+							DirectiveName="SpoolSize"
+							Label="Spool Size"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							/>
+					</div>
 				</div>
-				<div class="w3-container">
+				<div class="w3-container w3-margin-top">
 					<com:Application.Web.Portlets.DirectiveComboBox
-						ID="IncrementalBackupPool"
-						DirectiveName="IncrementalBackupPool"
-						Label="Incremental Backup Pool"
+						ID="Pool"
+						DirectiveName="Pool"
+						Label="Pool"
 						Show="true"
-						/>
+						ValidationGroup="NewJobDirective"
+						Required="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						 />
+					<span><a href="javascript:void(0)" onclick="$('#job_wizard_pool_directives').hide(); $('#job_wizard_new_pool').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Pool ]%></a></span>
+					<span><a href="javascript:void(0)" onclick="$('#job_wizard_new_pool').hide(); $('#job_wizard_pool_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Pool directives for Job ]%></a></span>
+				</div>
+				<div id="pool_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
+					<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
+					<p><%[ The resource has been created successfully. ]%></p>
+				</div>
+				<div id="job_wizard_new_pool" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+					<h3><%[ New Pool ]%></h3>
+					<com:Application.Web.Portlets.BaculaConfigDirectives
+						ID="PoolConfig"
+						ComponentType="dir"
+						ResourceType="Pool"
+						ShowCancelButton="false"
+						SaveDirectiveActionOk="$('#job_wizard_new_pool').slideUp(); set_new_pool(); $('#pool_save_ok').show();"
+					/>
 				</div>
-				<div class="w3-container">
-					<com:Application.Web.Portlets.DirectiveComboBox
-						ID="DifferentialBackupPool"
-						DirectiveName="DifferentialBackupPool"
-						Label="Differential Backup Pool"
-						Show="true"
-						/>
+				<div id="job_wizard_pool_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+					<h3><%[ Pool setting ]%></h3>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveComboBox
+							ID="FullBackupPool"
+							DirectiveName="FullBackupPool"
+							Label="Full Backup Pool"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							/>
+					</div>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveComboBox
+							ID="IncrementalBackupPool"
+							DirectiveName="IncrementalBackupPool"
+							Label="Incremental Backup Pool"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							/>
+					</div>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveComboBox
+							ID="DifferentialBackupPool"
+							DirectiveName="DifferentialBackupPool"
+							Label="Differential Backup Pool"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							/>
+					</div>
 				</div>
 			</div>
 			<com:TCallback ID="LoadPoolList" OnCallback="LoadPoolList" />
@@ -327,132 +359,158 @@
 			</script>
 		</com:TWizardStep>
 		<com:TWizardStep ID="Step4" Title="<%[ Step 4 - how would you like to backup ]%>" StepType="Auto">
-			<div class="w3-container">
-				<h2><%[ Job directives ]%></h2>
-			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="Level"
-					DirectiveName="Level"
-					Label="Level"
-					Show="true"
-					/>
-			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveCheckBox
-					ID="Accurate"
-					DirectiveName="Accurate"
-					DefaultValue="0"
-					Label="Accurate"
-					Show="true"
-					 />
-			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveTextBox
-					ID="MaximumConcurrentJobs"
-					DirectiveName="MaximumConcurrentJobs"
-					DefaultValue="1"
-					Label="Maximum Concurrent Jobs"
-					Show="true"
-					 />
-			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveTextBox
-					ID="Priority"
-					DirectiveName="Priority"
-					DefaultValue="10"
-					Label="Priority"
-					Show="true"
-					 />
-			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveCheckBox
-					ID="ReRunFailedLevels"
-					DirectiveName="ReRunFailedLevels"
-					DefaultValue="0"
-					Label="ReRun Failed Levels"
-					Show="true"
-					 />
-			</div>
-			<div class="w3-container">
-				<h2><%[ Other directives ]%></h2>
-			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="Messages"
-					DirectiveName="Messages"
-					Label="Messages"
-					Show="true"
-					ValidationGroup="NewJobDirective"
-					Required="true"
-					/>
-			</div>
-		</com:TWizardStep>
-		<com:TWizardStep ID="Step5" Title="<%[ Step 5 - when would you like to run backup ]%>" StepType="Auto">
-			<div class="w3-container">
-				<h2><%[ Schedule ]%></h2>
-			</div>
-			<div class="w3-container">
-				<com:Application.Web.Portlets.DirectiveComboBox
-					ID="Schedule"
-					DirectiveName="Schedule"
-					Label="Schedule"
-					Show="true"
-					/>
-				<span><a href="javascript:void(0)" onclick="$('#job_wizard_schedule_directives').hide(); $('#job_wizard_new_schedule').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Schedule ]%></a></span>
-				<span><a href="javascript:void(0)" onclick="$('#job_wizard_new_schedule').hide(); $('#job_wizard_reschedule_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Reschedule directives ]%></a></span>
-			</div>
-			<div id="schedule_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
-				<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
-				<p><%[ The resource has been created successfully. ]%></p>
-			</div>
-			<div id="job_wizard_new_schedule" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-				<h3><%[ New Schedule ]%></h3>
-				<com:Application.Web.Portlets.BaculaConfigDirectives
-					ID="ScheduleConfig"
-					ComponentType="dir"
-					ResourceType="Schedule"
-					ShowCancelButton="false"
-					SaveDirectiveActionOk="$('#job_wizard_new_schedule').slideUp(); set_new_schedule(); $('#schedule_save_ok').show();"
-				/>
-			</div>
-			<div id="job_wizard_reschedule_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
-				<h3><%[ Reschedule setting ]%></h3>
+			<div class="w3-half" style="float: none; margin: auto">
+				<div class="w3-container">
+					<h2><%[ Job directives ]%></h2>
+				</div>
+				<div class="w3-container">
+					<com:Application.Web.Portlets.DirectiveComboBox
+						ID="Level"
+						DirectiveName="Level"
+						Label="Level"
+						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+				</div>
 				<div class="w3-container">
 					<com:Application.Web.Portlets.DirectiveCheckBox
-						ID="RescheduleOnError"
-						DirectiveName="RescheduleOnError"
+						ID="Accurate"
+						DirectiveName="Accurate"
 						DefaultValue="0"
-						Label="Reschedule On Error"
+						Label="Accurate"
 						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
 						 />
 				</div>
 				<div class="w3-container">
-					<com:Application.Web.Portlets.DirectiveCheckBox
-						ID="RescheduleIncompleteJobs"
-						DirectiveName="RescheduleIncompleteJobs"
-						DefaultValue="0"
-						Label="Reschedule Incomplete Jobs"
+					<com:Application.Web.Portlets.DirectiveTextBox
+						ID="MaximumConcurrentJobs"
+						DirectiveName="MaximumConcurrentJobs"
+						DefaultValue="1"
+						Label="Maximum Concurrent Jobs"
 						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
 						 />
 				</div>
 				<div class="w3-container">
-					<com:Application.Web.Portlets.DirectiveTimePeriod
-						ID="RescheduleInterval"
-						DirectiveName="RescheduleInterval"
-						DefaultValue="1800"
-						Label="Reschedule Interval"
+					<com:Application.Web.Portlets.DirectiveTextBox
+						ID="Priority"
+						DirectiveName="Priority"
+						DefaultValue="10"
+						Label="Priority"
 						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
 						 />
 				</div>
 				<div class="w3-container">
-					<com:Application.Web.Portlets.DirectiveInteger
-						ID="RescheduleTimes"
-						DirectiveName="RescheduleTimes"
-						Label="Reschedule Times"
+					<com:Application.Web.Portlets.DirectiveCheckBox
+						ID="ReRunFailedLevels"
+						DirectiveName="ReRunFailedLevels"
+						DefaultValue="0"
+						Label="ReRun Failed Levels"
 						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
 						 />
 				</div>
+				<div class="w3-container">
+					<h2><%[ Other directives ]%></h2>
+				</div>
+				<div class="w3-container">
+					<com:Application.Web.Portlets.DirectiveComboBox
+						ID="Messages"
+						DirectiveName="Messages"
+						Label="Messages"
+						Show="true"
+						ValidationGroup="NewJobDirective"
+						Required="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+				</div>
+			</div>
+		</com:TWizardStep>
+		<com:TWizardStep ID="Step5" Title="<%[ Step 5 - when would you like to run backup ]%>" StepType="Auto">
+			<div class="w3-half" style="float: none; margin: auto">
+				<div class="w3-container">
+					<h2><%[ Schedule ]%></h2>
+				</div>
+				<div class="w3-container">
+					<com:Application.Web.Portlets.DirectiveComboBox
+						ID="Schedule"
+						DirectiveName="Schedule"
+						Label="Schedule"
+						Show="true"
+						ShowResetButton="false"
+						ShowRemoveButton="false"
+						/>
+					<span><a href="javascript:void(0)" onclick="$('#job_wizard_schedule_directives').hide(); $('#job_wizard_new_schedule').slideToggle(); oBaculaConfigSection.show_sections(true);" class="w3-button w3-green"><i class="fa fa-plus"></i> &nbsp;<%[ Add new Schedule ]%></a></span>
+					<span><a href="javascript:void(0)" onclick="$('#job_wizard_new_schedule').hide(); $('#job_wizard_reschedule_directives').slideToggle();" class="w3-button w3-green"><i class="fa fa-angle-down"></i> &nbsp;<%[ Show Reschedule directives ]%></a></span>
+				</div>
+				<div id="schedule_save_ok" class="w3-panel w3-green w3-display-container" style="display: none">
+					<span onclick="this.parentElement.style.display='none'" class="w3-button w3-green w3-large w3-display-topright">x</span>
+					<p><%[ The resource has been created successfully. ]%></p>
+				</div>
+				<div id="job_wizard_new_schedule" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+					<h3><%[ New Schedule ]%></h3>
+					<com:Application.Web.Portlets.BaculaConfigDirectives
+						ID="ScheduleConfig"
+						ComponentType="dir"
+						ResourceType="Schedule"
+						ShowCancelButton="false"
+						SaveDirectiveActionOk="$('#job_wizard_new_schedule').slideUp(); set_new_schedule(); $('#schedule_save_ok').show();"
+					/>
+				</div>
+				<div id="job_wizard_reschedule_directives" class="w3-card-4 w3-padding w3-margin-top" style="display: none">
+					<h3><%[ Reschedule setting ]%></h3>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveCheckBox
+							ID="RescheduleOnError"
+							DirectiveName="RescheduleOnError"
+							DefaultValue="0"
+							Label="Reschedule On Error"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							 />
+					</div>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveCheckBox
+							ID="RescheduleIncompleteJobs"
+							DirectiveName="RescheduleIncompleteJobs"
+							DefaultValue="0"
+							Label="Reschedule Incomplete Jobs"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							 />
+					</div>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveTimePeriod
+							ID="RescheduleInterval"
+							DirectiveName="RescheduleInterval"
+							DefaultValue="1800"
+							Label="Reschedule Interval"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							 />
+					</div>
+					<div class="w3-container">
+						<com:Application.Web.Portlets.DirectiveInteger
+							ID="RescheduleTimes"
+							DirectiveName="RescheduleTimes"
+							Label="Reschedule Times"
+							Show="true"
+							ShowResetButton="false"
+							ShowRemoveButton="false"
+							 />
+					</div>
+				</div>
 			</div>
 			<com:TCallback ID="LoadScheduleList" OnCallback="LoadScheduleList" />
 			<script type="text/javascript">
@@ -466,184 +524,186 @@
 			</script>
 		</com:TWizardStep>
 		<com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
-			<fieldset>
-				<legend><%[ General ]%></legend>
-				<div class="w3-container">
-					<div class="w3-quarter">Job Name</div>
-					<div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Description</div>
-					<div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">JobDefs</div>
-					<div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ What ]%></legend>
-				<div class="w3-container">
-					<div class="w3-quarter">Client</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Client->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+			<div class="w3-half" style="float: none; margin: auto">
+				<fieldset>
+					<legend><%[ General ]%></legend>
+					<div class="w3-container">
+						<div class="w3-quarter">Job Name</div>
+						<div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">FileSet</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Fileset->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Fileset', $this->Fileset->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Description</div>
+						<div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ Where ]%></legend>
-				<div class="w3-container">
-					<div class="w3-quarter">Storage</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Storage->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->Storage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">JobDefs</div>
+						<div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Spool Data</div>
-					<div class="w3-threequarter bold">
-						<%=$this->SpoolData->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('SpoolData', $this->SpoolData->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ What ]%></legend>
+					<div class="w3-container">
+						<div class="w3-quarter">Client</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Client->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Spool Attributes</div>
-					<div class="w3-threequarter bold">
-						<%=$this->SpoolAttributes->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('SpoolAttributes', $this->SpoolAttributes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">FileSet</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Fileset->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Fileset', $this->Fileset->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Spool Size</div>
-					<div class="w3-threequarter bold size">
-						<%=$this->SpoolSize->getDirectiveValue() ?: '0'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('SpoolSize', $this->SpoolSize->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ Where ]%></legend>
+					<div class="w3-container">
+						<div class="w3-quarter">Storage</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Storage->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->Storage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Pool</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Pool->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Spool Data</div>
+						<div class="w3-threequarter bold">
+							<%=$this->SpoolData->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('SpoolData', $this->SpoolData->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Full Backup Pool</div>
-					<div class="w3-threequarter bold">
-						<%=$this->FullBackupPool->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('FullBackupPool', $this->FullBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Spool Attributes</div>
+						<div class="w3-threequarter bold">
+							<%=$this->SpoolAttributes->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No')%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('SpoolAttributes', $this->SpoolAttributes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Incremental Backup Pool</div>
-					<div class="w3-threequarter bold">
-						<%=$this->IncrementalBackupPool->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('IncrementalBackupPool', $this->IncrementalBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Spool Size</div>
+						<div class="w3-threequarter bold size">
+							<%=$this->SpoolSize->getDirectiveValue() ?: '0'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('SpoolSize', $this->SpoolSize->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Differential Backup Pool</div>
-					<div class="w3-threequarter bold">
-						<%=$this->DifferentialBackupPool->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('DifferentialBackupPool', $this->DifferentialBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Pool</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Pool->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ How ]%></legend>
-				<div class="w3-container">
-					<div class="w3-quarter">Level</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Level->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Full Backup Pool</div>
+						<div class="w3-threequarter bold">
+							<%=$this->FullBackupPool->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('FullBackupPool', $this->FullBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Accurate</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Accurate->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Accurate', $this->Accurate->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Incremental Backup Pool</div>
+						<div class="w3-threequarter bold">
+							<%=$this->IncrementalBackupPool->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('IncrementalBackupPool', $this->IncrementalBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Maximum Concurrent Jobs</div>
-					<div class="w3-threequarter bold">
-						<%=$this->MaximumConcurrentJobs->getDirectiveValue() ?: $this->MaximumConcurrentJobs->getDefaultValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('MaximumConcurrentJobs', $this->MaximumConcurrentJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Differential Backup Pool</div>
+						<div class="w3-threequarter bold">
+							<%=$this->DifferentialBackupPool->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('DifferentialBackupPool', $this->DifferentialBackupPool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Priority</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Priority->getDirectiveValue() ?: $this->Priority->getDefaultValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Priority', $this->Priority->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ How ]%></legend>
+					<div class="w3-container">
+						<div class="w3-quarter">Level</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Level->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">ReRun Failed Levels</div>
-					<div class="w3-threequarter bold">
-						<%=$this->ReRunFailedLevels->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-						<span class="w3-small normal"><%=$this->isInJobDefs('ReRunFailedLevels', $this->ReRunFailedLevels->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Accurate</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Accurate->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Accurate', $this->Accurate->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ When ]%></legend>
-				<div class="w3-container">
-					<div class="w3-quarter">Schedule</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Schedule->getDirectiveValue() ?: '-' %>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Maximum Concurrent Jobs</div>
+						<div class="w3-threequarter bold">
+							<%=$this->MaximumConcurrentJobs->getDirectiveValue() ?: $this->MaximumConcurrentJobs->getDefaultValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('MaximumConcurrentJobs', $this->MaximumConcurrentJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Reschedule On Error</div>
-					<div class="w3-threequarter bold">
-						<%=$this->RescheduleOnError->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-						<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleOnError', $this->RescheduleOnError->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Priority</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Priority->getDirectiveValue() ?: $this->Priority->getDefaultValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Priority', $this->Priority->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Reschedule Incomplete Jobs</div>
-					<div class="w3-threequarter bold">
-						<%=$this->RescheduleIncompleteJobs->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
-						<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleIncompleteJobs', $this->RescheduleIncompleteJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">ReRun Failed Levels</div>
+						<div class="w3-threequarter bold">
+							<%=$this->ReRunFailedLevels->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+							<span class="w3-small normal"><%=$this->isInJobDefs('ReRunFailedLevels', $this->ReRunFailedLevels->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Reschedule Interval</div>
-					<div class="w3-threequarter bold time">
-						<%=$this->RescheduleInterval->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleInterval', $this->RescheduleInterval->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ When ]%></legend>
+					<div class="w3-container">
+						<div class="w3-quarter">Schedule</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Schedule->getDirectiveValue() ?: '-' %>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container">
-					<div class="w3-quarter">Reschedule Times</div>
-					<div class="w3-threequarter bold">
-						<%=$this->RescheduleTimes->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleTimes', $this->RescheduleTimes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Reschedule On Error</div>
+						<div class="w3-threequarter bold">
+							<%=$this->RescheduleOnError->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+							<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleOnError', $this->RescheduleOnError->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ Other directives ]%></legend>
-				<div class="w3-container">
-					<div class="w3-quarter">Messages</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Messages->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container">
+						<div class="w3-quarter">Reschedule Incomplete Jobs</div>
+						<div class="w3-threequarter bold">
+							<%=$this->RescheduleIncompleteJobs->getDirectiveValue() ? Prado::localize('Yes') : Prado::localize('No') %>
+							<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleIncompleteJobs', $this->RescheduleIncompleteJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+					<div class="w3-container">
+						<div class="w3-quarter">Reschedule Interval</div>
+						<div class="w3-threequarter bold time">
+							<%=$this->RescheduleInterval->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleInterval', $this->RescheduleInterval->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+					<div class="w3-container">
+						<div class="w3-quarter">Reschedule Times</div>
+						<div class="w3-threequarter bold">
+							<%=$this->RescheduleTimes->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('RescheduleTimes', $this->RescheduleTimes->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+				</fieldset>
+				<fieldset>
+					<legend><%[ Other directives ]%></legend>
+					<div class="w3-container">
+						<div class="w3-quarter">Messages</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Messages->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+				</fieldset>
+				<com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+			</div>
 		</com:TWizardStep>
 	</com:TWizard>
 	<script type="text/javascript">
diff --git a/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page b/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page
index 9ae29dd9e..f2bb80b25 100644
--- a/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page
+++ b/gui/baculum/protected/Web/Pages/NewCopyJobWizard.page
@@ -762,7 +762,7 @@ var oVolumeList = {
 			</div>
 			<div id="selection_type_oldest_volume" style="display: none">
 			</div>
-			<div id="selection_type_sql_query" style="display: none">
+			<div id="selection_type_sql_query" class="w3-half" style="float: none; display: none; margin: auto;">
 				<div class="w3-container w3-margin-top" style="position: relative">
 					<com:Application.Web.Portlets.DirectiveTextBox
 						ID="SelectionPatternSQLQuery"
@@ -1835,117 +1835,119 @@ function show_storage_warning(storage, pool, jobs) {
 			</div>
 		</com:TWizardStep>
 		<com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
-			<fieldset>
-				<legend><%[ General ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Job Name</div>
-					<div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Description</div>
-					<div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">JobDefs</div>
-					<div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ What ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Source Pool</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Pool->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+			<div class="w3-half" style="float: none; margin: auto">
+				<fieldset>
+					<legend><%[ General ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Job Name</div>
+						<div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Source Storage</div>
-					<div class="w3-threequarter bold">
-						<%=$this->SourceStorage->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Description</div>
+						<div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ How ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Selection Type</div>
-					<div class="w3-threequarter bold">
-						<%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">JobDefs</div>
+						<div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Selection Pattern</div>
-					<div class="w3-threequarter bold">
-						<%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ What ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Source Pool</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Pool->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ Where ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Destination Pool (NextPool)</div>
-					<div class="w3-threequarter bold">
-						<%=$this->NextPool->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Source Storage</div>
+						<div class="w3-threequarter bold">
+							<%=$this->SourceStorage->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Destination Storage</div>
-					<div class="w3-threequarter bold">
-						<%=$this->DestinationStorage->getDirectiveValue()%>
+				</fieldset>
+				<fieldset>
+					<legend><%[ How ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Selection Type</div>
+						<div class="w3-threequarter bold">
+							<%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ Options ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Maximum Spawned Jobs</div>
-					<div class="w3-threequarter bold">
-						<%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Selection Pattern</div>
+						<div class="w3-threequarter bold">
+							<%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Schedule</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Schedule->getDirectiveValue() ?: '-' %>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ Where ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Destination Pool (NextPool)</div>
+						<div class="w3-threequarter bold">
+							<%=$this->NextPool->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Messages</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Messages->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Destination Storage</div>
+						<div class="w3-threequarter bold">
+							<%=$this->DestinationStorage->getDirectiveValue()%>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Level</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Level->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ Options ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Maximum Spawned Jobs</div>
+						<div class="w3-threequarter bold">
+							<%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Client</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Client->getDirectiveValue()%>
-						<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Schedule</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Schedule->getDirectiveValue() ?: '-' %>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">FileSet</div>
-					<div class="w3-threequarter bold">
-						<%=$this->FileSet->getDirectiveValue()%>
-						<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Messages</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Messages->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Level</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Level->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Client</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Client->getDirectiveValue()%>
+							<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">FileSet</div>
+						<div class="w3-threequarter bold">
+							<%=$this->FileSet->getDirectiveValue()%>
+							<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+				</fieldset>
+				<com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+			</div>
 		</com:TWizardStep>
 	</com:TWizard>
 </com:TContent>
diff --git a/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page b/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page
index 9389f45ae..f2c185084 100644
--- a/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page
+++ b/gui/baculum/protected/Web/Pages/NewMigrateJobWizard.page
@@ -762,7 +762,7 @@ var oVolumeList = {
 			</div>
 			<div id="selection_type_oldest_volume" style="display: none">
 			</div>
-			<div id="selection_type_sql_query" style="display: none">
+			<div id="selection_type_sql_query" class="w3-half" style="float: none; display: none; margin: auto;">
 				<div class="w3-container w3-margin-top" style="position: relative">
 					<com:Application.Web.Portlets.DirectiveTextBox
 						ID="SelectionPatternSQLQuery"
@@ -1932,145 +1932,147 @@ function show_storage_warning(storage, pool, jobs) {
 			</div>
 		</com:TWizardStep>
 		<com:TWizardStep ID="Step6" Title="<%[ Step 6 - summary ]%>" StepType="Finish">
-			<fieldset>
-				<legend><%[ General ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Job Name</div>
-					<div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Description</div>
-					<div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">JobDefs</div>
-					<div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ What ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Source Pool</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Pool->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+			<div class="w3-half" style="float: none; margin: auto">
+				<fieldset>
+					<legend><%[ General ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Job Name</div>
+						<div class="w3-threequarter bold"><%=$this->Name->getDirectiveValue()%></div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Source Storage</div>
-					<div class="w3-threequarter bold">
-						<%=$this->SourceStorage->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Description</div>
+						<div class="w3-threequarter bold"><%=$this->Description->getDirectiveValue() ?: '-'%></div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ How ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Selection Type</div>
-					<div class="w3-threequarter bold">
-						<%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">JobDefs</div>
+						<div class="w3-threequarter bold"><%=$this->JobDefs->getDirectiveValue() ?: '-'%></div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Selection Pattern</div>
-					<div class="w3-threequarter bold">
-						<%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ What ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Source Pool</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Pool->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Pool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
-					<div class="w3-quarter">Migration High Bytes</div>
-					<div class="w3-threequarter bold">
-						<%=$this->MigrationHighBytes->Directive->getText()%> <%=$this->MigrationHighBytes->SizeFormat->getSelectedItem()->getText()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('MigrationHighBytes', ($this->MigrationHighBytes->getValue() ? $this->MigrationHighBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Source Storage</div>
+						<div class="w3-threequarter bold">
+							<%=$this->SourceStorage->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Storage', $this->SourceStorage->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
-					<div class="w3-quarter">Migration Low Bytes</div>
-					<div class="w3-threequarter bold">
-						<%=$this->MigrationLowBytes->Directive->getText()%> <%=$this->MigrationLowBytes->SizeFormat->getSelectedItem()->getText()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('MigrationLowBytes', ($this->MigrationLowBytes->getValue() ? $this->MigrationLowBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ How ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Selection Type</div>
+						<div class="w3-threequarter bold">
+							<%=$this->sel_types[$this->SelectionType->getDirectiveValue()]%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('SelectionType', $this->SelectionType->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolTime' ? 'block' : 'none'%>">
-					<div class="w3-quarter">Migration Time</div>
-					<div class="w3-threequarter bold">
-						<%=$this->MigrationTime->Directive->getText()%> <%=$this->MigrationTime->TimeFormat->getSelectedItem()->getText()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('MigrationTime', ($this->MigrationTime->getValue() ? $this->MigrationTime->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Selection Pattern</div>
+						<div class="w3-threequarter bold">
+							<%=$this->getPage()->getSelectionPatternValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('SelectionPattern', ($this->getSelectionPatternControl() ? $this->getSelectionPatternControl()->getDirectiveValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ Where ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Destination Pool (NextPool)</div>
-					<div class="w3-threequarter bold">
-						<%=$this->NextPool->getDirectiveValue()%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
+						<div class="w3-quarter">Migration High Bytes</div>
+						<div class="w3-threequarter bold">
+							<%=$this->MigrationHighBytes->Directive->getText()%> <%=$this->MigrationHighBytes->SizeFormat->getSelectedItem()->getText()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('MigrationHighBytes', ($this->MigrationHighBytes->getValue() ? $this->MigrationHighBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Destination Storage</div>
-					<div class="w3-threequarter bold">
-						<%=$this->DestinationStorage->getDirectiveValue()%>
+					<div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolOccupancy' ? 'block' : 'none'%>">
+						<div class="w3-quarter">Migration Low Bytes</div>
+						<div class="w3-threequarter bold">
+							<%=$this->MigrationLowBytes->Directive->getText()%> <%=$this->MigrationLowBytes->SizeFormat->getSelectedItem()->getText()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('MigrationLowBytes', ($this->MigrationLowBytes->getValue() ? $this->MigrationLowBytes->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<fieldset>
-				<legend><%[ Options ]%></legend>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Purge Migration Job</div>
-					<div class="w3-threequarter bold">
-						<%=$this->PurgeMigrationJob->getValue() ? Prado::localize('Yes') : Prado::localize('No')%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('PurgeMigrationJob', $this->PurgeMigrationJob->getValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small" style="display: <%=$this->SelectionType->getDirectiveValue() == 'PoolTime' ? 'block' : 'none'%>">
+						<div class="w3-quarter">Migration Time</div>
+						<div class="w3-threequarter bold">
+							<%=$this->MigrationTime->Directive->getText()%> <%=$this->MigrationTime->TimeFormat->getSelectedItem()->getText()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('MigrationTime', ($this->MigrationTime->getValue() ? $this->MigrationTime->getValue() : '')) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Maximum Spawned Jobs</div>
-					<div class="w3-threequarter bold">
-						<%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ Where ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Destination Pool (NextPool)</div>
+						<div class="w3-threequarter bold">
+							<%=$this->NextPool->getDirectiveValue()%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('NextPool', $this->Pool->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Schedule</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Schedule->getDirectiveValue() ?: '-' %>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Destination Storage</div>
+						<div class="w3-threequarter bold">
+							<%=$this->DestinationStorage->getDirectiveValue()%>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Messages</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Messages->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+				</fieldset>
+				<fieldset>
+					<legend><%[ Options ]%></legend>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Purge Migration Job</div>
+						<div class="w3-threequarter bold">
+							<%=$this->PurgeMigrationJob->getValue() ? Prado::localize('Yes') : Prado::localize('No')%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('PurgeMigrationJob', $this->PurgeMigrationJob->getValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Level</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Level->getDirectiveValue() ?: '-'%>
-						<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Maximum Spawned Jobs</div>
+						<div class="w3-threequarter bold">
+							<%=$this->MaximumSpawnedJobs->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('MaximumSpawnedJobs', $this->MaximumSpawnedJobs->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">Client</div>
-					<div class="w3-threequarter bold">
-						<%=$this->Client->getDirectiveValue()%>
-						<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Schedule</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Schedule->getDirectiveValue() ?: '-' %>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Schedule', $this->Schedule->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-				<div class="w3-container w3-padding-small">
-					<div class="w3-quarter">FileSet</div>
-					<div class="w3-threequarter bold">
-						<%=$this->FileSet->getDirectiveValue()%>
-						<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Messages</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Messages->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal"><%=$this->isInJobDefs('Messages', $this->Messages->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
 					</div>
-				</div>
-			</fieldset>
-			<com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Level</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Level->getDirectiveValue() ?: '-'%>
+							<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Level', $this->Level->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">Client</div>
+						<div class="w3-threequarter bold">
+							<%=$this->Client->getDirectiveValue()%>
+							<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Client', $this->Client->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+					<div class="w3-container w3-padding-small">
+						<div class="w3-quarter">FileSet</div>
+						<div class="w3-threequarter bold">
+							<%=$this->FileSet->getDirectiveValue()%>
+							<span class="w3-small normal">(<%[ Not used ]%>) <%=$this->isInJobDefs('Fileset', $this->FileSet->getDirectiveValue()) ? ' (' . Prado::localize('inherited from JobDefs') . ')': ''%></span>
+						</div>
+					</div>
+				</fieldset>
+				<com:TActiveLabel ID="CreateResourceErrorMsg" Display="None" CssClass="w3-text-red"></com:TActiveLabel>
+			</div>
 		</com:TWizardStep>
 	</com:TWizard>
 </com:TContent>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
index be453e7cb..5084baee2 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
@@ -7,7 +7,7 @@
 			Visible="<%=$this->display_directive%>"
 			AutoPostBack="false"
 			ActiveControl.EnableUpdate="false"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
 		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl b/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
index 78f002ad5..cae4e4f8e 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
@@ -7,7 +7,7 @@
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 			AutoTrim="true"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
 		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
index 2756bb07c..625aee49c 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
@@ -8,7 +8,7 @@
 			Visible="<%=$this->display_directive%>"
 			AutoPostBack="false"
 			ActiveControl.EnableUpdate="false"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
 		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl b/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl
index 8a99c2d0d..dcf73a6c4 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl
@@ -5,7 +5,7 @@
 	<prop:ItemTemplate>
 		<div class="w3-card w3-padding directive">
 			<com:TActiveLinkButton
-				CssClass="w3-button w3-green w3-right"
+				CssClass="w3-button w3-red w3-right"
 				OnCommand="SourceTemplateControl.removeMessages"
 				CommandName="<%=$this->ItemIndex%>"
 			>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.tpl
index ae3d6697f..ea3188ca8 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.tpl
@@ -7,12 +7,10 @@
 					CssClass="w3-input w3-border w3-twothird"
 					AutoPostBack="false"
 					ActiveControl.EnableUpdate="false"
-				/> 	<com:TActiveLinkButton ID="AddFieldBtn"
+				/> &nbsp;<com:TActiveLinkButton ID="AddFieldBtn"
 						OnCommand="SourceTemplateControl.addField"
 						CommandParameter="save"
-					>
-					<i class="fa fa-plus" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i>
-				</com:TActiveLinkButton>
+					><i class="fa fa-plus plus_btn" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i></com:TActiveLinkButton>
 				<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->SourceTemplateControl->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 				<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 				<div class="directive_help" style="clear: left; display: none"><%=$this->SourceTemplateControl->doc%></div>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.tpl
index b0eb1055f..56a4cbf8b 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.tpl
@@ -7,15 +7,11 @@
 					CssClass="w3-input w3-border w3-twothird"
 					ActiveControl.EnableUpdate="false"
 					AutoTrim="true"
-				/> 	<com:TActiveLinkButton ID="AddFieldBtn"
+				/> &nbsp;<com:TActiveLinkButton ID="AddFieldBtn"
 						OnCommand="SourceTemplateControl.addField"
 						CommandParameter="save"
 						ClientSide.OnComplete="var el = $('#<%=$this->SourceTemplateControl->MultiTextBoxRepeater->ClientID%>_Container').find('input[type=\'text\']'); el[el.length-1].focus();"
-					>
-					<prop:Text>
-						<i class="fa fa-plus" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i>
-					</prop:Text>
-				</com:TActiveLinkButton>
+					><i class="fa fa-plus plus_btn" title="<%[ Add directive ]%>" alt="<%[ Add directive ]%>"></i></com:TActiveLinkButton>
 				<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->SourceTemplateControl->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 				<i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 				<div class="directive_help" style="clear: left; display: none"><%=$this->SourceTemplateControl->doc%></div>
diff --git a/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl b/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
index 3c71d8aeb..1c6eee9ff 100644
--- a/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
@@ -9,8 +9,7 @@
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 			AutoTrim="true"
-		/>
-		 <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
 		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<a href="javascript:void(0)" onclick="var el = document.getElementById('<%=$this->Directive->ClientID%>'); el.type = el.type == 'text' ? 'password' : 'text'"><i class="fa fa-eye"></i></a>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl b/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
index d7ea83d12..765316e9d 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
@@ -3,20 +3,20 @@
 	<div class="w3-col w3-threequarter directive_value">
 		<com:TActiveTextBox ID="Directive"
 			OnTextChanged="saveValue"
-			CssClass="w3-input w3-border w3-third"
+			CssClass="w3-input w3-border w3-half"
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 		/>
 		<com:TActiveDropDownList
 			ID="SizeFormat"
-			CssClass="w3-select w3-border w3-quarter"
+			CssClass="w3-select w3-border w3-half"
 			DataTextField="label"
 			DataValueField="format"
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 			AutoPostBack="false"
 			OnSelectedIndexChanged="saveValue"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
 		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fsize = Units.format_size(parseInt('<%=$this->getDefaultValue()%>', 10), 'B'); document.getElementById('<%=$this->Directive->ClientID%>').value = fsize.value; document.getElementById('<%=$this->SizeFormat->ClientID%>').value = fsize.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
index fb3db1c31..2b1475cf5 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
@@ -3,20 +3,20 @@
 	<div class="w3-col w3-threequarter directive_value">
 		<com:TActiveTextBox ID="Directive"
 			OnTextChanged="saveValue"
-			CssClass="w3-input w3-border w3-third"
+			CssClass="w3-input w3-border w3-half"
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 		/>
 		<com:TActiveDropDownList
 			ID="SpeedFormat"
-			CssClass="w3-select w3-border w3-quarter"
+			CssClass="w3-select w3-border w3-half"
 			DataTextField="label"
 			DataValueField="format"
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 			AutoPostBack="false"
 			OnSelectedIndexChanged="saveValue"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
 		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fspeed = Units.format_speed(parseInt('<%=$this->getDefaultValue()%>', 10), 'B/s'); document.getElementById('<%=$this->Directive->ClientID%>').value = fspeed.value; document.getElementById('<%=$this->SpeedFormat->ClientID%>').value = fspeed.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
index 25dfcde0b..5aafcecd9 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
@@ -7,7 +7,7 @@
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 			AutoTrim="true"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
 		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTime.tpl b/gui/baculum/protected/Web/Portlets/DirectiveTime.tpl
index dab5467df..3c950d0f4 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveTime.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTime.tpl
@@ -20,7 +20,8 @@
 			Visible="<%=($this->display_directive && $this->ShowMinute)%>"
 			ActiveControl.EnableUpdate="false"
 			AutoPostBack="false"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
+		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Hour->ClientID%>').value = '<%=isset($this->DefaultValue->Hour) ? $this->DefaultValue->Hour : ''%>';document.getElementById('<%=$this->Minute->ClientID%>').value = '<%=isset($this->DefaultValue->Minute) ? $this->DefaultValue->Minute : ''%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Hour->ClientID%>').value = '';document.getElementById('<%=$this->Minute->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TCustomValidator
@@ -34,5 +35,6 @@
 			Enabled="<%=$this->getRequired() && $this->getShow()%>"
 			Visible="<%=$this->ShowMinute%>"
 		/>
+		<div class="directive_help" style="clear: left; display: none"><%=$this->doc%></div>
 	</div>
 </div>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl b/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
index 6e525cdd1..102cc947a 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
@@ -3,20 +3,22 @@
 	<div class="w3-col w3-threequarter directive_value">
 		<com:TActiveTextBox ID="Directive"
 			OnTextChanged="saveValue"
-			CssClass="w3-input w3-border w3-third"
+			CssClass="w3-input w3-border w3-half"
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 		/>
 		<com:TActiveDropDownList
 			ID="TimeFormat"
-			CssClass="w3-select w3-border w3-quarter"
+			CssClass="w3-select w3-border w3-half"
 			DataTextField="label"
 			DataValueField="format"
 			Visible="<%=$this->display_directive%>"
 			ActiveControl.EnableUpdate="false"
 			AutoPostBack="false"
+			Style="max-width: 200px"
 			OnSelectedIndexChanged="saveValue"
-		/> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
+		/> &nbsp;<i class="fa fa-asterisk w3-text-red directive_required" style="visibility: <%=$this->getRequired() ? 'visible' : 'hidden'%>;"></i>
+		<i class="fas fa-info-circle help_icon w3-text-green" style="display: <%=($this->doc ? 'inline-block': 'none')%>;" onclick="var h = $(this).nextAll('div.directive_help'); var disp = h.get(0).style.display; $('div.directive_help').slideUp('fast'); if (disp == 'none') { h.slideDown('fast'); }"></i>
 		<i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var ftime = Units.format_time_period(parseInt('<%=$this->getDefaultValue()%>', 10), 'second'); document.getElementById('<%=$this->Directive->ClientID%>').value = ftime.value; document.getElementById('<%=$this->TimeFormat->ClientID%>').value = ftime.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
 		<i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
 		<com:TRequiredFieldValidator
@@ -28,5 +30,6 @@
 			Text="Field required."
 			Enabled="<%=$this->getRequired() && $this->getShow()%>"
 		/>
+		<div class="directive_help" style="clear: left; display: none"><%=$this->doc%></div>
 	</div>
 </div>
diff --git a/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php b/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php
index b20d3379d..79df1be77 100644
--- a/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php
+++ b/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php
@@ -41,7 +41,7 @@ class JobRunscriptRenderer extends DirectiveRenderer {
 		parent::onInit($param);
 		if ($this->ItemIndex % self::DIRECTIVE_COUNT === 0) {
 			$alb = new TActiveLinkButton;
-			$alb->CssClass = 'w3-button w3-green w3-right';
+			$alb->CssClass = 'w3-button w3-red w3-right';
 			$alb->OnCommand = 'SourceTemplateControl.removeRunscript';
 			$alb->CommandName = $this->ItemIndex / self::DIRECTIVE_COUNT;
 			$alb->Text = '<i class="fa fa-trash-alt"></i> &nbsp;' . Prado::localize('Remove');
diff --git a/gui/baculum/protected/Web/Portlets/NewFileSetFileOptMenu.tpl b/gui/baculum/protected/Web/Portlets/NewFileSetFileOptMenu.tpl
index 2458ff604..adab04b8b 100644
--- a/gui/baculum/protected/Web/Portlets/NewFileSetFileOptMenu.tpl
+++ b/gui/baculum/protected/Web/Portlets/NewFileSetFileOptMenu.tpl
@@ -4,7 +4,7 @@
 		<li><com:TActiveLinkButton
 			ID="IncludeFileItem"
 			OnCommand="Parent.SourceTemplateControl.newIncludeFile"
-			ClientSide.OnComplete="var el1 = $('#<%=$this->IncludeFileItem->ClientID%>').parents('div').find('div.include_file')[<%=$this->Parent->ItemIndex%>]; var el2 = $(el1).find('div'); BaculaConfig.scroll_to_element(el2[el2.length-1], 0); $(el2[el2.length-1]).find('input')[0].focus();"
+			ClientSide.OnComplete="var el1 = $('#<%=$this->IncludeFileItem->ClientID%>').parents('div').find('div.include_file')[<%=$this->Parent->ItemIndex%>]; var el2 = $(el1).find('div'); BaculaConfig.scroll_to_element(el2[el2.length-2], 0); $(el2[el2.length-2]).find('input')[0].focus();"
 			Attributes.onclick="$(this).closest('div.config_new_fileset').hide();"
 			>
 			<i class='fa fa-plus'></i> &nbsp;<%[ Add single file/directory ]%>
diff --git a/gui/baculum/themes/Baculum-v2/css/baculum.css b/gui/baculum/themes/Baculum-v2/css/baculum.css
index 0bc6cc4b4..0f3f9393a 100644
--- a/gui/baculum/themes/Baculum-v2/css/baculum.css
+++ b/gui/baculum/themes/Baculum-v2/css/baculum.css
@@ -238,11 +238,22 @@ div.TDatePicker_default {
 	z-index: 10 !important;
 }
 
+i.directive_required {
+	line-height: 40px;
+}
+
+i.help_icon {
+	 margin-left: 16px !important;
+	 cursor: pointer;
+}
 i.reset_btn, i.remove_btn {
 	display: none;
 	cursor: pointer;
 	margin-left: 4px;
 }
+i.plus_btn {
+	margin-right: 2px;
+}
 
 div.directive_value i {
 	vertical-align: middle;
@@ -252,6 +263,13 @@ div.directive_value:hover i.reset_btn, div.directive_value:hover i.remove_btn {
 	display: inline;
 }
 
+div.directive_field input, div.directive_field select {
+	max-width: 400px;
+}
+div.directive_field input.w3-half, div.directive_field select.w3-half {
+	max-width: 200px;
+}
+
 div.details_card {
 	min-height: 200px;
 }
@@ -613,12 +631,6 @@ img.job_weather_icon {
 	width: 14px;
 }
 
-i.help_icon {
-	 margin-left: 16px !important;
-	 margin-right: 16px !important;
-	 cursor: pointer;
-}
-
 div.directive_help dt, div.directive_help dd {
 	color: #333;
 }