diff --git a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
index af0912af73d2f27035425f99dd6b16e4d6a6a76b..88a336aab2204a645e1d3c892c25a8e559f49245 100644
--- a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
+++ b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
@@ -138,7 +138,7 @@ export default function CustomUiPreview({
     backgroundColor = "white";
   }
   if (backgroundUrl) {
-    backgroundUrl = `${url_path}:${url_port}/${backgroundUrl}`;
+    backgroundUrl = encodeURI(`${url_path}:${url_port}/${backgroundUrl}`);
   }
 
   const isCompactDisplay = !hasTitle && !hasDescription && !hasTips;
diff --git a/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js b/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js
index b0cc2e5f5427da6dd00d97a8dcb5717bb76f09d9..08add6591943119440c3d55d55254bf7d542b73d 100644
--- a/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js
+++ b/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js
@@ -21,11 +21,10 @@ const styles = {
   },
   logo: {
     position: "absolute",
-    left: 0,
+    left: "-1px",
     top: 0,
     backgroundColor: infoColor[0],
-    borderRadius: (props) =>
-      props.isCompactDisplay ? "20px" : "20px 20px 20px 0px",
+    borderRadius: "20px 20px 20px 0px",
     padding: "0px 5px 0px 5px",
   },
   nameplate: {
diff --git a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
index c504e136e417d7525a9e30c0189a11acb9bc3d78..140970bc3f96da5f89b5e0ef401ee07d244debfc 100644
--- a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
+++ b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
@@ -32,8 +32,8 @@ export default function LanguagePicker(props) {
       .then((result) => {
         const response = result.data.map(({ attributes }) => attributes);
         let translates_languages = [
-          ...response,
           { code: "en", name: "English" },
+          ...response,
         ];
 
         const exists = translates_languages
diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js b/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js
index 70c705395feeea79f1f2a8ad4257fd5d9ad7d2bb..5831a73b47dd3a6d22711d9551782eecb090a4db 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js
@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 
 import Checkbox from "@material-ui/core/Checkbox";
+import Switch from "@material-ui/core/Switch";
 import { SketchPicker } from "react-color";
 import FormGroup from "@material-ui/core/FormGroup";
 import FormControlLabel from "@material-ui/core/FormControlLabel";
@@ -43,7 +44,7 @@ const IsCustomizationEnabledForm = ({
     <FormGroup row>
       <FormControlLabel
         control={
-          <Checkbox
+          <Switch
             checked={isCustomizationEnabled}
             color="primary"
             onChange={(e) => {
diff --git a/jams-react-client/src/views/Blueprint/policyData.constants.js b/jams-react-client/src/views/Blueprint/policyData.constants.js
index 967baebb88ff6f39b9991248f8eaee86f8aaca98..f5fcd93d9e6b125bf0232b9c9d5a2ac1863f9f93 100644
--- a/jams-react-client/src/views/Blueprint/policyData.constants.js
+++ b/jams-react-client/src/views/Blueprint/policyData.constants.js
@@ -4,7 +4,7 @@ export const DEFAULT_UI_CUSTOMIZATION = {
   title: "",
   hasDescription: true,
   description: "",
-  hasTips: false,
+  hasTips: true,
 
   hasBackground: false,
   backgroundColor: "",