diff --git a/Client/src/Components/Inputs/Field/index.css b/Client/src/Components/Inputs/Field/index.css
index 3dfaf6142..33196b3b9 100644
--- a/Client/src/Components/Inputs/Field/index.css
+++ b/Client/src/Components/Inputs/Field/index.css
@@ -1,13 +1,13 @@
 .field {
-	min-width: 250px;
+	min-width: var(--env-var-width-3);
 }
 
 .field-infrastructure-alert {
-	max-width: 100px;
+	max-width: var(--env-var-width-4);
 }
 
 .field-infrastructure-alert .MuiInputBase-root:has(input) {
-	height: 34px;
+	height: var(--env-var-height-2);
 }
 
 .field h3.MuiTypography-root,
@@ -23,7 +23,7 @@
 	padding-right: var(--env-var-spacing-1-minus);
 }
 .field .MuiInputBase-root:has(input) {
-	height: 34px;
+	height: var(--env-var-height-2);
 }
 .field .MuiInputBase-root:has(.MuiInputAdornment-root) {
 	padding-right: var(--env-var-spacing-1-minus);
diff --git a/Client/src/Utils/stringUtils.js b/Client/src/Utils/stringUtils.js
index 6aeb53bad..693051f17 100644
--- a/Client/src/Utils/stringUtils.js
+++ b/Client/src/Utils/stringUtils.js
@@ -1,3 +1,8 @@
+/**
+ * Helper function to get first letter capitalized string
+ * @param {string} str String whose first letter is to be capitalized
+ * @returns A string with first letter capitalized
+ */
 export const capitalizeFirstLetter = (str) =>{
-  return  str.charAt(0).toUpperCase() + str.slice(1);
+  return  str?.charAt(0).toUpperCase() + str.slice(1);
 }
diff --git a/Client/src/index.css b/Client/src/index.css
index 369e5d16b..173551ba6 100644
--- a/Client/src/index.css
+++ b/Client/src/index.css
@@ -20,6 +20,8 @@ html {
 
 	--env-var-width-1: 100vw;
 	--env-var-width-2: 360px;
+	--env-var-width-3: 250px;
+	--env-var-width-4: 100px;
 
 	--env-var-height-1: 100vh;
 	--env-var-height-2: 34px;