diff --git a/lib/new-admin/graphql/resolvers/customer.resolver.js b/lib/new-admin/graphql/resolvers/customer.resolver.js
index d3563669..bbe46195 100644
--- a/lib/new-admin/graphql/resolvers/customer.resolver.js
+++ b/lib/new-admin/graphql/resolvers/customer.resolver.js
@@ -21,7 +21,7 @@ const resolvers = {
       return customers.updateCustomer(customerId, customerInput, token)
     },
     addCustomField: (...[, { customerId, label, value }]) => customers.addCustomField(customerId, label, value),
-    saveCustomField: (...[, { customerId, fieldId, newValue }]) => customers.saveCustomField(customerId, fieldId, newValue),
+    saveCustomField: (...[, { customerId, fieldId, value }]) => customers.saveCustomField(customerId, fieldId, value),
     removeCustomField: (...[, [ { customerId, fieldId } ]]) => customers.removeCustomField(customerId, fieldId),
     editCustomer: async (root, { customerId, customerEdit }, context) => {
       const token = authentication.getToken(context)
diff --git a/new-lamassu-admin/src/components/Carousel.js b/new-lamassu-admin/src/components/Carousel.js
index f751cd1f..35f4ef20 100644
--- a/new-lamassu-admin/src/components/Carousel.js
+++ b/new-lamassu-admin/src/components/Carousel.js
@@ -38,6 +38,12 @@ export const Carousel = memo(({ photosData, slidePhoto }) => {
             opacity: 1
           }
         }}
+        // navButtonsWrapperProps={{
+        //   style: {
+        //     background: 'linear-gradient(to right, black 10%, transparent 80%)',
+        //     opacity: '0.4'
+        //   }
+        // }}
         autoPlay={false}
         indicators={false}
         navButtonsAlwaysVisible={true}
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.js b/new-lamassu-admin/src/pages/Customers/CustomerData.js
index 3f792db3..1a06b233 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerData.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerData.js
@@ -360,19 +360,24 @@ const CustomerData = ({
     <div>
       <div className={classes.header}>
         <H3 className={classes.title}>{'Customer data'}</H3>
-        <FeatureButton
-          active={!listView}
-          className={classes.viewIcons}
-          Icon={OverviewIcon}
-          InverseIcon={OverviewReversedIcon}
-          onClick={() => setListView(false)}
-        />
-        <FeatureButton
-          active={listView}
-          className={classes.viewIcons}
-          Icon={CustomerListViewIcon}
-          InverseIcon={CustomerListViewReversedIcon}
-          onClick={() => setListView(true)}></FeatureButton>
+        {// TODO: Remove false condition for next release
+        false && (
+          <>
+            <FeatureButton
+              active={!listView}
+              className={classes.viewIcons}
+              Icon={OverviewIcon}
+              InverseIcon={OverviewReversedIcon}
+              onClick={() => setListView(false)}
+            />
+            <FeatureButton
+              active={listView}
+              className={classes.viewIcons}
+              Icon={CustomerListViewIcon}
+              InverseIcon={CustomerListViewReversedIcon}
+              onClick={() => setListView(true)}></FeatureButton>
+          </>
+        )}
       </div>
       <div>
         {!listView && customer && (
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
index 71b24ba2..8ea827a1 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
@@ -18,8 +18,8 @@ import { ReactComponent as BlockReversedIcon } from 'src/styling/icons/button/bl
 import { ReactComponent as BlockIcon } from 'src/styling/icons/button/block/zodiac.svg'
 import { ReactComponent as DataReversedIcon } from 'src/styling/icons/button/data/white.svg'
 import { ReactComponent as DataIcon } from 'src/styling/icons/button/data/zodiac.svg'
-import { ReactComponent as DiscountReversedIcon } from 'src/styling/icons/button/discount/white.svg'
-import { ReactComponent as Discount } from 'src/styling/icons/button/discount/zodiac.svg'
+// import { ReactComponent as DiscountReversedIcon } from 'src/styling/icons/button/discount/white.svg'
+// import { ReactComponent as Discount } from 'src/styling/icons/button/discount/zodiac.svg'
 import { fromNamespace, namespaces } from 'src/utils/config'
 
 import CustomerData from './CustomerData'
@@ -494,14 +494,17 @@ const CustomerProfile = memo(() => {
                   onClick={() => setWizard(true)}>
                   {`Manual data entry`}
                 </ActionButton>
-                <ActionButton
+                {
+                  // TODO: Enable for next release
+                  /* <ActionButton
                   className={classes.actionButton}
                   color="primary"
                   Icon={Discount}
                   InverseIcon={DiscountReversedIcon}
                   onClick={() => {}}>
                   {`Add individual discount`}
-                </ActionButton>
+                </ActionButton> */
+                }
                 {isSuspended && (
                   <ActionButton
                     className={classes.actionButton}
diff --git a/new-lamassu-admin/src/pages/Customers/components/EditableCard.js b/new-lamassu-admin/src/pages/Customers/components/EditableCard.js
index 65507e91..2a7cba0a 100644
--- a/new-lamassu-admin/src/pages/Customers/components/EditableCard.js
+++ b/new-lamassu-admin/src/pages/Customers/components/EditableCard.js
@@ -207,17 +207,19 @@ const EditableCard = ({
                 <div className={classes.edit}>
                   {!editing && (
                     <div className={classes.editButton}>
-                      <div className={classes.deleteButton}>
-                        <ActionButton
-                          color="primary"
-                          type="button"
-                          Icon={DeleteIcon}
-                          InverseIcon={DeleteReversedIcon}
-                          onClick={() => deleteEditedData()}>
-                          {`Delete`}
-                        </ActionButton>
-                      </div>
-
+                      {// TODO: Remove false condition for next release
+                      false && (
+                        <div className={classes.deleteButton}>
+                          <ActionButton
+                            color="primary"
+                            type="button"
+                            Icon={DeleteIcon}
+                            InverseIcon={DeleteReversedIcon}
+                            onClick={() => deleteEditedData()}>
+                            {`Delete`}
+                          </ActionButton>
+                        </div>
+                      )}
                       <ActionButton
                         color="primary"
                         Icon={EditIcon}
diff --git a/new-lamassu-admin/src/pages/Customers/helper.js b/new-lamassu-admin/src/pages/Customers/helper.js
index 009b21a5..c0d86f55 100644
--- a/new-lamassu-admin/src/pages/Customers/helper.js
+++ b/new-lamassu-admin/src/pages/Customers/helper.js
@@ -42,6 +42,11 @@ const useStyles = makeStyles({
   },
   picker: {
     width: 150
+  },
+  field: {
+    '& > *:last-child': {
+      marginBottom: 24
+    }
   }
 })
 
@@ -183,9 +188,11 @@ const EntryType = ({ customInfoRequirementOptions }) => {
             component={RadioGroup}
             name="requirement"
             options={
-              !R.isEmpty(customInfoRequirementOptions)
-                ? updateRequirementOptions(requirementOptions)
-                : requirementOptions
+              requirementOptions
+              // TODO: Enable once custom info requirement manual entry is finished
+              // !R.isEmpty(customInfoRequirementOptions)
+              //   ? updateRequirementOptions(requirementOptions)
+              //   : requirementOptions
             }
             labelClassName={classes.label}
             radioClassName={classes.radio}
@@ -248,11 +255,18 @@ const ManualDataEntry = ({ selectedValues, customInfoRequirementOptions }) => {
           }}
         />
       )}
-      {!upload &&
-        !isCustomInfoRequirement &&
-        elements.options.map(({ label, name }) => (
-          <Field name={name} label={label} component={TextInput} width={390} />
-        ))}
+      <div className={classes.field}>
+        {!upload &&
+          !isCustomInfoRequirement &&
+          elements.options.map(({ label, name }) => (
+            <Field
+              name={name}
+              label={label}
+              component={TextInput}
+              width={390}
+            />
+          ))}
+      </div>
       {upload && (
         <Upload
           type={