diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css
index 6b22c82a6..83b6f26a0 100644
--- a/xCAT-UI/css/style.css
+++ b/xCAT-UI/css/style.css
@@ -83,6 +83,7 @@
 	color: #0000FF;
 	text-decoration: none;
 	cursor: pointer;
+	font-weight: normal;
 }
 
 #header div a:hover {
diff --git a/xCAT-UI/js/service/service.js b/xCAT-UI/js/service/service.js
index d4e998e1e..426e2dc93 100644
--- a/xCAT-UI/js/service/service.js
+++ b/xCAT-UI/js/service/service.js
@@ -41,7 +41,7 @@ function initServicePage() {
 	}
 
 	// Load jQuery stylesheets
-	includeCss("css/query.dataTables.css");
+	includeCss("css/jquery.dataTables.css");
 	includeCss("css/superfish.css");
 	includeCss("css/jstree.css");
 	includeCss("css/jquery.jqplot.css");
@@ -57,9 +57,13 @@ function initServicePage() {
 	includeJs("js/jquery/jquery.jqplot.min.js");
     includeJs("js/jquery/jqplot.dateAxisRenderer.min.js");
 	    
+	// Enable settings link 	
+	$('#xcat_settings').click(function() {
+		openSettings();
+	});
+	
 	// Show service page
 	$("#content").children().remove();
-	includeJs("js/service/service.js");
 	includeJs("js/service/utils.js");
 	loadServicePage();
 }
diff --git a/xCAT-UI/js/ui.js b/xCAT-UI/js/ui.js
index 83a572bef..ea003998b 100644
--- a/xCAT-UI/js/ui.js
+++ b/xCAT-UI/js/ui.js
@@ -483,7 +483,7 @@ function initPage() {
 	}
 
 	// Load jQuery stylesheets
-	includeCss("css/query.dataTables.css");
+	includeCss("css/jquery.dataTables.css");
 	includeCss("css/superfish.css");
 	includeCss("css/jstree.css");
 	includeCss("css/jquery.jqplot.css");
@@ -755,7 +755,7 @@ function openSettings() {
         	"Ok": function(){
         		// Save selected theme
         		var theme = $(this).find('input[name="theme"]:checked').val();
-        		$.cookie('xcat_theme', theme, { expires: 30 });
+        		$.cookie('xcat_theme', theme);	// Do not expire cookie, keep it as long as possible
         		
         		// Show instructions to apply theme
         		$(this).empty();
diff --git a/xCAT-UI/service.php b/xCAT-UI/service.php
index 2959625ac..972ce6428 100644
--- a/xCAT-UI/service.php
+++ b/xCAT-UI/service.php
@@ -34,7 +34,7 @@ echo
 if (isset($_SESSION['srv_username'])){
 	echo 
 		"<div>
-			<span style='padding: 0 6px; color: white; font-weight: bold;'>{$_SESSION['srv_username']}</span> | <a id='xcat_settings'>Settings</a> | <a href='lib/logout.php'>Log out</a>
+			<span style='padding: 0 6px; color: white; font-weight: bold;'>{$_SESSION['srv_username']}</span> | <a id='xcat_settings'>Settings</a> | <a href='lib/srv_logout.php'>Log out</a>
 		</div>";
 }
 
diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec
index 0bd3cabde..ff60d4266 100644
--- a/xCAT-UI/xCAT-UI.spec
+++ b/xCAT-UI/xCAT-UI.spec
@@ -80,6 +80,16 @@ cp -r * $RPM_BUILD_ROOT%{prefix}/ui
 chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/*
 set -x
 
+%ifos linux
+	# Copy xCAT plugins to /opt/xcat/lib/perl/xCAT_plugin
+	cp %{prefix}/ui/xcat/plugins/web.pm /opt/xcat/lib/perl/xCAT_plugin/
+	cp %{prefix}/ui/xcat/plugins/webportal.pm /opt/xcat/lib/perl/xCAT_plugin/
+	/bin/ln -s /opt/xcat/bin/xcatclientnnr /opt/xcat/bin/webportal
+	/etc/init.d/xcatd restart
+%else   # AIX
+	# TBD
+%endif
+
 %files
 %defattr(-,root,root)
 %{prefix}/ui
@@ -138,13 +148,7 @@ set -x
 	fi
 	
 	if [ "$1" = 1 ] || [ "$1" = 2 ]		# Install or upgrade
-	then
-		# Copy xCAT plugins to /opt/xcat/lib/perl/xCAT_plugin
-		cp %{prefix}/ui/xcat/plugins/web.pm /opt/xcat/lib/perl/xCAT_plugin/
-		cp %{prefix}/ui/xcat/plugins/webportal.pm /opt/xcat/lib/perl/xCAT_plugin/
-		/bin/ln -s /opt/xcat/bin/xcatclientnnr /opt/xcat/bin/webportal
-		/etc/init.d/xcatd restart
-		
+	then		
 		# Copy php.ini file into /opt/xcat/ui and turn off output_buffering
 		if [ -e "/etc/redhat-release" ]; then
 			/bin/sed /etc/php.ini -e 's/output_buffering = 4096/output_buffering = Off/g' > %{prefix}/ui/php.ini