diff --git a/src/fireedge/src/client/apps/provision/theme.js b/src/fireedge/src/client/apps/provision/theme.js
index 37c785876b..f4147a1fe7 100644
--- a/src/fireedge/src/client/apps/provision/theme.js
+++ b/src/fireedge/src/client/apps/provision/theme.js
@@ -6,10 +6,8 @@ export default (mode = 'dark') => ({
       white: '#ffffff'
     },
     background: {
-      paper: mode === 'dark' ? '#2e3440' : '#ffffff',
-      // PREV paper: mode === 'dark' ? '#2a2d3d' : '#eceff4',
-      default: mode === 'dark' ? '#242933' : '#f2f4f8'
-      // PREV default: mode === 'dark' ? '#222431' : '#d8dee9'
+      paper: mode === 'dark' ? '#2a2d3d' : '#ffffff',
+      default: mode === 'dark' ? '#222431' : '#f2f4f8'
     },
     primary: {
       light: '#2a2d3d',
diff --git a/src/fireedge/src/client/components/Cards/ProvisionCard.js b/src/fireedge/src/client/components/Cards/ProvisionCard.js
index 6921f2469e..38687cf3ca 100644
--- a/src/fireedge/src/client/components/Cards/ProvisionCard.js
+++ b/src/fireedge/src/client/components/Cards/ProvisionCard.js
@@ -66,7 +66,7 @@ const ProvisionCard = memo(
     prev.isSelected === next.isSelected &&
     !prev.isProvider &&
     !next.isProvider &&
-    prev.value?.BODY?.state === next.value?.BODY?.state
+    prev.value?.TEMPLATE?.BODY?.state === next.value?.TEMPLATE?.BODY?.state
   )
 )
 
diff --git a/src/fireedge/src/client/components/DebugLog/ansiHtml.js b/src/fireedge/src/client/components/DebugLog/ansiHtml.js
index 3b88258ba2..db28f4e5f0 100644
--- a/src/fireedge/src/client/components/DebugLog/ansiHtml.js
+++ b/src/fireedge/src/client/components/DebugLog/ansiHtml.js
@@ -1,8 +1,8 @@
 // Reference to https://github.com/sindresorhus/ansi-regex
 // eslint-disable-next-line no-control-regex
-var _regANSI = /(?:(?:\u001b\[)|\u009b)(?:(?:[0-9]{1,3})?(?:(?:;[0-9]{0,3})*)?[A-M|f-m])|\u001b[A-M]/
+export const _regANSI = /(?:(?:\u001b\[)|\u009b)(?:(?:[0-9]{1,3})?(?:(?:;[0-9]{0,3})*)?[A-M|f-m])|\u001b[A-M]/
 
-var _defColors = {
+const _defColors = {
   reset: ['fff', '000'], // [FOREGROUD_COLOR, BACKGROUND_COLOR]
   black: '000',
   red: 'ff0000',
@@ -14,7 +14,7 @@ var _defColors = {
   lightgrey: 'f0f0f0',
   darkgrey: '888'
 }
-var _styles = {
+const _styles = {
   30: 'black',
   31: 'red',
   32: 'green',
@@ -24,7 +24,7 @@ var _styles = {
   36: 'cyan',
   37: 'lightgrey'
 }
-var _openTags = {
+const _openTags = {
   1: 'font-weight:bold', // bold
   2: 'opacity:0.5', // dim
   3: '<i>', // italic
@@ -32,7 +32,7 @@ var _openTags = {
   8: 'display:none', // hidden
   9: '<del>' // delete
 }
-var _closeTags = {
+const _closeTags = {
   23: '</i>', // reset italic
   24: '</u>', // reset underscore
   29: '</del>' // reset delete
@@ -57,7 +57,7 @@ export default function ansiHTML (text) {
   var ansiCodes = []
   // Replace with markup.
   var ret = text.replace(/\033\[(\d+)*m/g, function (match, seq) {
-    var ot = _openTags[seq]
+    const ot = _openTags[seq]
     if (ot) {
       // If current sequence has been opened, close it.
       if (!!~ansiCodes.indexOf(seq)) { // eslint-disable-line no-extra-boolean-cast
@@ -69,7 +69,7 @@ export default function ansiHTML (text) {
       return ot[0] === '<' ? ot : '<span style="' + ot + ';">'
     }
 
-    var ct = _closeTags[seq]
+    const ct = _closeTags[seq]
     if (ct) {
       // Pop sequence
       ansiCodes.pop()
@@ -95,7 +95,7 @@ ansiHTML.setColors = function (colors) {
   }
 
   var _finalColors = {}
-  for (var key in _defColors) {
+  for (const key in _defColors) {
     var hex = Object.prototype.hasOwnProperty.call(colors, key) ? colors[key] : null
     if (!hex) {
       _finalColors[key] = _defColors[key]
@@ -161,12 +161,11 @@ function _setTags (colors) {
   // dark grey
   _openTags['90'] = 'color:#' + colors.darkgrey
 
-  for (var code in _styles) {
-    var color = _styles[code]
-    var oriColor = colors[color] || '000'
+  for (const code in _styles) {
+    const color = _styles[code]
+    const oriColor = colors[color] || '000'
     _openTags[code] = 'color:#' + oriColor
-    code = parseInt(code)
-    _openTags[(code + 10).toString()] = 'background:#' + oriColor
+    _openTags[(parseInt(code) + 10).toString()] = 'background:#' + oriColor
   }
 }
 
diff --git a/src/fireedge/src/client/components/DebugLog/message.js b/src/fireedge/src/client/components/DebugLog/message.js
index 93966128c1..59f78e4ad1 100644
--- a/src/fireedge/src/client/components/DebugLog/message.js
+++ b/src/fireedge/src/client/components/DebugLog/message.js
@@ -7,8 +7,9 @@ import ChevronRightIcon from '@material-ui/icons/ChevronRight'
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
 
 import { DEBUG_LEVEL } from 'client/constants'
-import AnsiHtml from 'client/components/DebugLog/ansiHtml'
+import AnsiHtml, { _regANSI } from 'client/components/DebugLog/ansiHtml'
 
+const cleanANSI = (text = '') => text.replace(_regANSI, '')
 const MAX_CHARS = 80
 
 const useStyles = makeStyles(theme => ({
@@ -31,6 +32,9 @@ const useStyles = makeStyles(theme => ({
   time: {
     minWidth: '220px'
   },
+  message: {
+    whiteSpace: 'pre-line'
+  },
   [DEBUG_LEVEL.ERROR]: { borderLeft: `0.3em solid ${theme.palette.error.light}` },
   [DEBUG_LEVEL.WARN]: { borderLeft: `0.3em solid ${theme.palette.warning.light}` },
   [DEBUG_LEVEL.INFO]: { borderLeft: `0.3em solid ${theme.palette.info.light}` },
@@ -60,9 +64,12 @@ const Message = memo(({ timestamp, severity, message }) => {
       </div>
       <div className={classes.time}>{timestamp}</div>
       {(isCollapsed && isMoreThanMaxChars) ? (
-        <div>{`${message?.slice(0, MAX_CHARS)}…`}</div>
+        <div className={classes.message}>
+          {`${cleanANSI(message?.slice(0, MAX_CHARS))}…`}
+        </div>
       ) : (
-        <div dangerouslySetInnerHTML={{ __html: AnsiHtml(message) }} />
+        <div className={classes.message}
+          dangerouslySetInnerHTML={{ __html: AnsiHtml(message) }} />
       )}
     </div>
   )
diff --git a/src/fireedge/src/client/components/List/ListCards/index.js b/src/fireedge/src/client/components/List/ListCards/index.js
index b947bdbba5..4640174fac 100644
--- a/src/fireedge/src/client/components/List/ListCards/index.js
+++ b/src/fireedge/src/client/components/List/ListCards/index.js
@@ -11,7 +11,7 @@ import { EmptyCard } from 'client/components/Cards'
 import FloatingActionButton from 'client/components/Fab'
 import listCardsStyles from 'client/components/List/ListCards/styles'
 
-const ListCards = memo(({
+const ListCards = ({
   list,
   keyProp,
   breakpoints,
@@ -78,7 +78,7 @@ const ListCards = memo(({
       )}
     </Grid>
   )
-})
+}
 
 const gridValues = [false, 'auto', true, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]