diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/datetime.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/datetime.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/datetime.html.ep	2022-01-05 15:52:46.048500428 +0000
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/datetime.html.ep	2022-01-04 15:05:00.000000000 +0000
@@ -11,7 +11,7 @@
     % }
 
     % if ( stash 'error' ) {
-    	<br><div class=sme-error>
+   	<br><div class=sme-error>
     	%= $c->render_to_string(inline => stash 'error') 
 	</div>
     %}
@@ -31,81 +31,87 @@
 	</span>
 	<br>
     % if ($dat_datas->{ntpstatus} eq 'disabled') {
-
-	%=l 'dat_NTP_ENABLE_DESC'
-	<br>
-	</p>
+	<div class='datetime-set-ntp'>
+		%=l 'dat_NTP_ENABLE_DESC'
+		<br>
+	</div>	
     % } else {
-	%=l 'dat_NTP_CONFIGURE_DESC'
-	<br><br>
-	%=l 'dat_CURRENT_SETTING'
-	<span class=data>
-	%= $dat_datas->{now_string}
-	</span>
-	<br>
-	<span class=label>
-	%=l 'dat_NTP_SERVER'
-	</span><span class=data2>
-	%= text_field 'Ntpserver' =>  $dat_datas->{ntpserver}, class => 'input'
-	</span>
-	</p>
-    % }	
-	<p>
+	<div class='datetime-set-ntp'>
+		%=l 'dat_NTP_CONFIGURE_DESC'
+		<br><br>
+		<p>
+		%=l 'dat_CURRENT_SETTING'
+		<b>
+		%= $dat_datas->{now_string}
+		</b>
+		</p>
+		<br>
+		<span class=label>
+		%=l 'dat_NTP_SERVER'
+		</span><span class=data2>
+		%= text_field 'Ntpserver' =>  $dat_datas->{ntpserver}, class => 'input'
+		</span>
+		</p>
+	</div>
+	% }	
 	%= radio_button Ntpstatus => 'disabled'
-	<span class=label>
+	<span class=label datetime-set-ntp>
 	%=l 'dat_NTP_DISABLE_TITLE'
 	</span>
 
     % if ($dat_datas->{ntpstatus} eq 'enabled') {
 
 	<br><BR>
-	%=l 'dat_NTP_DISABLE_DESC'
-	</p>
-    % } else {
-	<br>
-	</p>
-	<p>
-	%=l 'dat_CURRENT_SETTING'
-	<span class=label>
-	%= $dat_datas->{now_string}
-	</span>
-	<br>
-	<span class=label>
-	%=l 'dat_NEW_M/D/Y'
-	</span><span class=data2>
-	% param 'Month' => $dat_datas->{month} unless param 'Month';
-	%= select_field 'Month' => $c->getMonth_list(), class => 'input'
-	</span><span class=data2>
-	% param 'Day' => $dat_datas->{day} unless param 'Day';
-	%= text_field 'Day', size => '2', class => 'input'
-	</span><span class=data2>
-	% param 'Year' => $dat_datas->{year} unless param 'Year';
-	%= text_field 'Year', size => '4', class => 'input'
-	</span>
-	<br>
-	<span class=label>
-	%=l 'dat_NEW_H/M/S'
-	</span><span class=data2>
-	% param 'Hour' => $dat_datas->{hour} unless param 'Hour';
-	%= text_field 'Hour', size => '2', class => 'input'
-	</span><span class=data2>
-	% param 'Minute' => $dat_datas->{minute} unless param 'Minute';
-	%= text_field 'Minute', size => '2', class => 'input'
-	</span><span class=data2>
-	% param 'Second' => $dat_datas->{second} unless param 'Second';
-	%= text_field 'Second', size => '2', class => 'input'
-	</span>
-	<br>
-	<span class=label>
-	%=l 'dat_AM/PM_AND_TZ'
-	</span><span class=data2>
-	% param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
-	%= select_field 'Ampm' =>  ['AM', 'PM'], class => 'input'
-	</span><span class=data2>
-	% param 'Timezone' => $c->getTimezone() unless param 'Timezone';
-	%= select_field 'Timezone' =>  $c->getZone_list(), class => 'input'
-	</span>
-	</p>
+	<div class='datetime-set-ntp'>
+		%=l 'dat_NTP_DISABLE_DESC'
+	</div>	
+	% } else {
+	<div class='datetime-set-ntp'>
+		<br>
+		</p>
+		<p>
+		%=l 'dat_CURRENT_SETTING'
+		<b>
+		%= $dat_datas->{now_string}
+		</b>
+		<br>
+		<span class=label>
+		%=l 'dat_NEW_M/D/Y'
+		</span><span class=data2>
+		% param 'Month' => $dat_datas->{month} unless param 'Month';
+		%= select_field 'Month' => $c->getMonth_list(), class => 'input'
+		</span><span class=data2>
+		% param 'Day' => $dat_datas->{day} unless param 'Day';
+		%= text_field 'Day', size => '2', class => 'input'
+		</span><span class=data2>
+		% param 'Year' => $dat_datas->{year} unless param 'Year';
+		%= text_field 'Year', size => '4', class => 'input'
+		</span>
+		<br>
+		<span class=label>
+		%=l 'dat_NEW_H/M/S'
+		</span><span class=data2>
+		% param 'Hour' => $dat_datas->{hour} unless param 'Hour';
+		%= text_field 'Hour', size => '2', class => 'input'
+		</span><span class=data2>
+		% param 'Minute' => $dat_datas->{minute} unless param 'Minute';
+		%= text_field 'Minute', size => '2', class => 'input'
+		</span><span class=data2>
+		% param 'Second' => $dat_datas->{second} unless param 'Second';
+		%= text_field 'Second', size => '2', class => 'input'
+		</span>
+		<br>
+		<span class=label>
+		%=l 'dat_AM/PM_AND_TZ'
+		</span><span class=data2>
+		% param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm';
+		%= select_field 'Ampm' =>  ['AM', 'PM'], class => 'input'
+		</span><span class=data2>
+		% param 'Timezone' => $c->getTimezone() unless param 'Timezone';
+		%= select_field 'Timezone' =>  $c->getZone_list(), class => 'input'
+		</span>
+		</p>
+	</div>	
     % }
 	<p>
 	<br>
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/reboot.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/reboot.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/reboot.html.ep	2022-01-05 15:52:46.053500474 +0000
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/reboot.html.ep	2022-01-04 15:05:00.000000000 +0000
@@ -16,15 +16,17 @@
     %= $modul
 
     <% 	my $btn = l('PERFORM'); %>
+    %= form_for 'reboot' => (method => 'POST') => begin
 
+	<p>
     %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
     <br>
 
-    %= form_for 'reboot' => (method => 'POST') => begin
-	<p>
 	<span class=label>
 	%=l 'rbo_LABEL_REBOOT'
-	</span><span class=data>
+	</span>
+
+	<span class=data>
 	%= select_field 'function' => $c->rebootFunction_list()
 	</span>
 	</p>