diff --git a/Installer/pkgPostInstall.sh b/Installer/pkgPostInstall.sh
index adbb0cff..c3c98cfa 100644
--- a/Installer/pkgPostInstall.sh
+++ b/Installer/pkgPostInstall.sh
@@ -3,10 +3,8 @@
TARGET='vChewing'
login_user=$(/usr/bin/stat -f%Su /dev/console)
-base_ver=12.0
-ver=$(sw_vers | grep ProductVersion | cut -d':' -f2 | tr -d ' ')
-if [ $(echo -e $base_ver"\n"$ver | sort -V | tail -1) == "$base_ver" ]
-then
+OS_Version=$(sw_vers -productVersion)
+if [[ ${OS_Version} < 12.0.0 ]]; then
# Copy the wrongfully installed contents to the right location:
cp -r /Library/Input\ Methods/"${TARGET}".app /Users/"${login_user}"/Library/Input\ Methods/ || true
cp -r /Library/Keyboard\ Layouts/"${TARGET}"* /Users/"${login_user}"/Library/Keyboard\ Layouts/ || true
diff --git a/Source/WindowNIBs/frmClientListMgr.xib b/Source/WindowNIBs/frmClientListMgr.xib
index 7830d421..a4b6bf0c 100644
--- a/Source/WindowNIBs/frmClientListMgr.xib
+++ b/Source/WindowNIBs/frmClientListMgr.xib
@@ -3,6 +3,7 @@
+
@@ -40,7 +41,7 @@
-
+
@@ -48,8 +49,8 @@
-
-
+
+
@@ -69,7 +70,7 @@
-
+