diff --git a/docs/extra.css b/docs/extra.css
index 43d2f41678..d830bfb3c4 100644
--- a/docs/extra.css
+++ b/docs/extra.css
@@ -3,22 +3,65 @@ table {
 }
 
 table tr th {
-  padding: 5px 10px;
-  background-color: #ddd;
-  border:1px solid #aaa !important;
-  min-width:240px;
+  padding: 10px 10px;
+  background-color: #2980B9;
+  border:0px solid #aaa !important;
+  color: #fff;
+  font-weight: normal;
+}
+
+table tr th a, table tr th a:hover, table tr th a:active, table tr th a:visited {
+  color: #fff !important;
+  text-decoration: underline;
 }
 
 table tr td {
-  padding: 5px 10px;
-  border:1px solid #aaa !important;
-  min-width:240px;
+  padding: 10px 10px;
+  border:0px solid #aaa !important;
+  vertical-align: middle;
 }
 
 table tr:nth-child(even) {
+  background-color: #f3f6f6;
+}
+table tr:nth-child(odd) {
   background-color: #eee;
 }
 
+
+table.compatabilityMatrix tr th {
+  text-align: left;
+}
+table.compatabilityMatrix tr th.firstColumn {
+  text-align: left;
+}
+
+
+table.compatabilityMatrix tr td {
+  text-align: left;
+}
+table.compatabilityMatrix tr td.firstColumn {
+  font-weight: bold;
+  text-align: left;
+}
+
+
+table.supportMatrix tr th {
+  text-align: center;
+}
+
+table tr th.spacer {
+  background-color: #FCFCFC !important;
+  width: 2px !important;
+  padding: 0 !important;
+}
+
+table tr td.spacer {
+  background-color: #FCFCFC !important;
+  width: 2px !important;
+  padding: 0 !important;
+}
+
 /* If an unordered list immediately follows a normal paragraph, set negative
    margin so that it flows better */
 div[role=main] p + ul {
diff --git a/image/cli/Dockerfile b/image/cli/Dockerfile
index a2eea1ed02..eb4d158332 100644
--- a/image/cli/Dockerfile
+++ b/image/cli/Dockerfile
@@ -25,7 +25,8 @@ RUN umask 0002 && \
     bash /tmp/install/install-ibmcloud.sh && \
     bash /tmp/install/install-skopeo.sh && \
     bash /tmp/install/install-aws.sh && \
-    rm -rf /tmp/install
+    rm -rf /tmp/install && \
+    rm /opt/app-root/src/.wget-hsts /opt/app-root/src/README.md /opt/app-root/src/LICENSE
 
 # 4. Install tini
 ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini /tini
diff --git a/image/cli/install/install-ibmcloud.sh b/image/cli/install/install-ibmcloud.sh
index 03bef8d7f2..96bc2013e4 100644
--- a/image/cli/install/install-ibmcloud.sh
+++ b/image/cli/install/install-ibmcloud.sh
@@ -6,10 +6,14 @@ set -e
 wget -q https://download.clis.cloud.ibm.com/ibm-cloud-cli/2.12.1/IBM_Cloud_CLI_2.12.1_amd64.tar.gz
 tar -xzf IBM_Cloud_CLI_2.12.1_amd64.tar.gz
 mv Bluemix_CLI/bin/ibmcloud /usr/local/bin/
-rm -rf Bluemix_CLI IBM_Cloud_CLI_2.3.0_amd64.tar.gz
+rm -rf Bluemix_CLI IBM_Cloud_CLI_2.12.1_amd64.tar.gz
 ibmcloud plugin repo-plugins -r 'IBM Cloud'
 ibmcloud plugin install container-service
 ibmcloud plugin install container-registry
 
 # We don't want remove the plugins (in .bluemix/plugins) only the configuration file generated by the above actions
 rm /opt/app-root/src/.bluemix/config.json
+
+# Fix up permissions so that the group has the same permissions as the (root) user
+chown -R default:root /opt/app-root/src/.bluemix
+chmod -R g=u /opt/app-root/src/.bluemix