diff --git a/ui/packages/shared/pages/Configuration/InputWithTooltip/index.tsx b/ui/packages/shared/pages/Configuration/InputWithTooltip/index.tsx
index 1ec421e3bebde46ef5b57f556a5224b7c285736d..f13534a408dcaa07240e4312b09a346bd2b3b5d0 100644
--- a/ui/packages/shared/pages/Configuration/InputWithTooltip/index.tsx
+++ b/ui/packages/shared/pages/Configuration/InputWithTooltip/index.tsx
@@ -14,7 +14,7 @@ const useStyles = makeStyles(
   {
     textField: {
       '& .MuiOutlinedInput-notchedOutline': {
-        borderColor: '#000 !important',
+        borderColor: '#000',
       },
     },
     selectField: {
@@ -27,6 +27,12 @@ const useStyles = makeStyles(
         backgroundColor: 'inherit',
       },
     },
+    label: {
+      display: 'block',
+    },
+    error: {
+      color: '#f44336',
+    },
   },
   { index: 1 },
 )
@@ -49,23 +55,35 @@ export const InputWithTooltip = ({
   const classes = useStyles()
 
   return (
-    <Box mt={2} mb={2} display="flex" alignItems="center">
-      <TextField
-        className={classNames(!disabled && classes.textField, styles.textField)}
-        label={label}
-        variant="outlined"
-        size="small"
-        value={value}
-        error={Boolean(error)}
-        onChange={onChange}
-        disabled={disabled}
-        InputLabelProps={{
-          shrink: true,
-        }}
-      />
-      <Tooltip interactive content={<p>{tooltipText()}</p>}>
-        <InfoIcon className={styles.infoIcon} />
-      </Tooltip>
+    <Box
+      mt={2}
+      mb={2}
+      display="flex"
+      flexDirection="column"
+      justifyContent="flex-start"
+      alignItems="flex-start"
+      gap="5px"
+    >
+      <label className={classNames(error && classes.error, classes.label)}>
+        {label}
+      </label>
+      <Box display="flex" alignItems="center" width="100%">
+        <TextField
+          className={classNames(
+            !disabled && classes.textField,
+            styles.textField,
+          )}
+          variant="outlined"
+          size="small"
+          value={value}
+          error={Boolean(error)}
+          onChange={onChange}
+          disabled={disabled}
+        />
+        <Tooltip interactive content={<p>{tooltipText()}</p>}>
+          <InfoIcon className={styles.infoIcon} />
+        </Tooltip>
+      </Box>
     </Box>
   )
 }
@@ -94,8 +112,17 @@ export const InputWithChip = ({
   const classes = useStyles()
 
   return (
-    <Box mt={2} mb={1}>
-      <Box display="flex" alignItems="center">
+    <Box
+      mt={2}
+      mb={1}
+      display="flex"
+      flexDirection="column"
+      justifyContent="flex-start"
+      alignItems="flex-start"
+      gap="5px"
+    >
+      <label className={classes.label}>{label}</label>
+      <Box display="flex" alignItems="center" width="100%">
         <TextField
           className={classNames(
             !disabled && classes.textField,
@@ -106,7 +133,6 @@ export const InputWithChip = ({
           value={value}
           multiline
           disabled={disabled}
-          label={label}
           inputProps={{
             name: id,
             id: id,
@@ -119,9 +145,9 @@ export const InputWithChip = ({
           <InfoIcon className={styles.infoIcon} />
         </Tooltip>
       </Box>
-      <div className={styles.chipContainer}>
-        {value &&
-          uniqueChipValue(value)
+      {value && (
+        <div className={styles.chipContainer}>
+          {uniqueChipValue(value)
             .split(' ')
             .map((uniqueValue, index) => {
               if (uniqueValue !== '') {
@@ -139,7 +165,8 @@ export const InputWithChip = ({
                 )
               }
             })}
-      </div>
+        </div>
+      )}
     </Box>
   )
 }
@@ -164,15 +191,25 @@ export const SelectWithTooltip = ({
   const classes = useStyles()
 
   return (
-    <Box mt={2} mb={2}>
-      <Box mb={1} display="flex" alignItems="center">
+    <Box
+      mt={1}
+      display="flex"
+      flexDirection="column"
+      justifyContent="flex-start"
+      alignItems="flex-start"
+      gap="5px"
+    >
+      <label className={classNames(error && classes.error, classes.label)}>
+        {label}
+      </label>
+      <Box display="flex" alignItems="center" width="100%">
         <Select
           className={classNames(
             classes.selectField,
             !disabled && classes.textField,
             styles.textField,
           )}
-          label={label}
+          label=""
           error={error}
           value={value}
           disabled={disabled}
diff --git a/ui/packages/shared/pages/Configuration/index.tsx b/ui/packages/shared/pages/Configuration/index.tsx
index ef31e4a24e4661cb3a297767e3e29f63dfc17f6d..9b90914c2874b490b84d25abcc0b68d0d9e82668 100644
--- a/ui/packages/shared/pages/Configuration/index.tsx
+++ b/ui/packages/shared/pages/Configuration/index.tsx
@@ -14,12 +14,12 @@ import {
   Typography,
   Snackbar,
   makeStyles,
+  Button,
 } from '@material-ui/core'
 import Box from '@mui/material/Box'
 
 import { Modal } from '@postgres.ai/shared/components/Modal'
 import { StubSpinner } from '@postgres.ai/shared/components/StubSpinner'
-import { Button } from '@postgres.ai/shared/components/Button'
 import { ExternalIcon } from '@postgres.ai/shared/icons/External'
 import { Spinner } from '@postgres.ai/shared/components/Spinner'
 import { useStores } from '@postgres.ai/shared/pages/Instance/context'
@@ -130,11 +130,26 @@ export const Configuration = observer(
     const [{ formik, connectionData, isConnectionDataValid }] =
       useForm(onSubmit)
 
+    const scrollToField = () => {
+      const errorElement = document.querySelector('.Mui-error')
+      if (errorElement) {
+        errorElement.scrollIntoView({ behavior: 'smooth', block: 'center' })
+        const inputElement = errorElement.querySelector('input')
+        if (inputElement) {
+          setTimeout(() => {
+            inputElement.focus()
+          }, 1000)
+        }
+      }
+    }
+
     const onTestConnectionClick = async () => {
       setConnectionRes(null)
       Object.keys(connectionData).map(function (key: string) {
         if (key !== 'password' && key !== 'db_list') {
-          formik.validateField(key)
+          formik.validateField(key).then(() => {
+            scrollToField()
+          })
         }
       })
       if (isConnectionDataValid) {
@@ -305,11 +320,11 @@ export const Configuration = observer(
                   label={'Debug mode'}
                 />
               </Box>
-              <Box mb={2}>
+              <Box mb={2} mt={1}>
                 <ConfigSectionTitle tag="databaseContainer" />
                 <span
                   className={classes.grayText}
-                  style={{ marginTop: '0.5rem', display: 'block' }}
+                  style={{ margin: '0.5rem 0 1rem 0', display: 'block' }}
                 >
                   DLE manages various database containers, such as clones. This
                   section defines default container settings.
@@ -317,7 +332,7 @@ export const Configuration = observer(
                 {dleEdition !== 'community' ? (
                   <div>
                     <SelectWithTooltip
-                      label="dockerImage - choose from the list"
+                      label="dockerImage - choose from the list *"
                       value={formik.values.dockerImageType}
                       error={Boolean(formik.errors.dockerImageType)}
                       tooltipText={tooltipText.dockerImageType}
@@ -332,7 +347,7 @@ export const Configuration = observer(
                     />
                     {formik.values.dockerImageType === 'custom' ? (
                       <InputWithTooltip
-                        label="dockerImage"
+                        label="dockerImage *"
                         value={formik.values.dockerImage}
                         error={formik.errors.dockerImage}
                         tooltipText={tooltipText.dockerImage}
@@ -343,7 +358,7 @@ export const Configuration = observer(
                       />
                     ) : (
                       <SelectWithTooltip
-                        label="dockerImage - Postgres major version"
+                        label="dockerImage - Postgres major version *"
                         value={formik.values.dockerImage}
                         error={Boolean(formik.errors.dockerImage)}
                         tooltipText={tooltipText.dockerImage}
@@ -425,7 +440,7 @@ export const Configuration = observer(
                     Source database credentials and dumping options.
                   </span>
                   <InputWithTooltip
-                    label="source.connection.host"
+                    label="source.connection.host *"
                     value={formik.values.host}
                     error={formik.errors.host}
                     tooltipText={tooltipText.host}
@@ -435,7 +450,7 @@ export const Configuration = observer(
                     }
                   />
                   <InputWithTooltip
-                    label="source.connection.port"
+                    label="source.connection.port *"
                     value={formik.values.port}
                     error={formik.errors.port}
                     tooltipText={tooltipText.port}
@@ -445,7 +460,7 @@ export const Configuration = observer(
                     }
                   />
                   <InputWithTooltip
-                    label="source.connection.username"
+                    label="source.connection.username *"
                     value={formik.values.username}
                     error={formik.errors.username}
                     tooltipText={tooltipText.username}
@@ -463,7 +478,7 @@ export const Configuration = observer(
                     }
                   />
                   <InputWithTooltip
-                    label="source.connection.dbname"
+                    label="source.connection.dbname *"
                     value={formik.values.dbname}
                     error={formik.errors.dbname}
                     tooltipText={tooltipText.dbname}
@@ -472,6 +487,17 @@ export const Configuration = observer(
                       formik.setFieldValue('dbname', e.target.value)
                     }
                   />
+                  <InputWithChip
+                    id="databases"
+                    value={formik.values.databases}
+                    label="Databases"
+                    tooltipText={tooltipText.databases}
+                    handleDeleteChip={handleDeleteChip}
+                    disabled={isConfigurationDisabled}
+                    onChange={(e) =>
+                      formik.setFieldValue('databases', e.target.value)
+                    }
+                  />
                   <Box mt={2}>
                     <InputWithChip
                       value={formik.values.databases}
@@ -485,14 +511,12 @@ export const Configuration = observer(
                       }
                     />
                   </Box>
-                  <Box mt={2} mb={3}>
+                  <Box mt={3} mb={3}>
                     <Button
-                      variant="primary"
-                      size="medium"
+                      variant="contained"
+                      color="secondary"
                       onClick={onTestConnectionClick}
-                      isDisabled={
-                        isConnectionLoading || isConfigurationDisabled
-                      }
+                      disabled={isConnectionLoading || isConfigurationDisabled}
                     >
                       Test connection
                       {isConnectionLoading && (
@@ -644,10 +668,14 @@ export const Configuration = observer(
               }}
             >
               <Button
-                variant="primary"
-                size="medium"
-                onClick={formik.submitForm}
-                isDisabled={formik.isSubmitting || isConfigurationDisabled}
+                variant="contained"
+                color="secondary"
+                onClick={() => {
+                  formik.submitForm().then(() => {
+                    scrollToField()
+                  })
+                }}
+                disabled={formik.isSubmitting || isConfigurationDisabled}
               >
                 Apply changes
                 {formik.isSubmitting && (
@@ -656,8 +684,8 @@ export const Configuration = observer(
               </Button>
               <Box sx={{ px: 2 }}>
                 <Button
-                  variant="secondary"
-                  size="medium"
+                  variant="outlined"
+                  color="secondary"
                   onClick={() => switchActiveTab(null, 0)}
                 >
                   Cancel
diff --git a/ui/packages/shared/pages/Configuration/styles.module.scss b/ui/packages/shared/pages/Configuration/styles.module.scss
index d165693000a5b0ce0a6f602d15d52074452660da..80041d27f025b062fdf50b69ba2e6896a92c2dd1 100644
--- a/ui/packages/shared/pages/Configuration/styles.module.scss
+++ b/ui/packages/shared/pages/Configuration/styles.module.scss
@@ -1,5 +1,5 @@
 .textField {
-  width: 350px;
+  width: 400px;
   max-width: 100%;
 
   input,
@@ -16,6 +16,10 @@
     cursor: not-allowed;
     color: rgba(0, 0, 0, 0.38);
   }
+
+  @media (max-width: 600px) {
+    width: 100%;
+  }
 }
 
 .chipContainer {
diff --git a/ui/packages/shared/pages/Configuration/useForm.ts b/ui/packages/shared/pages/Configuration/useForm.ts
index b8de95fd02b3fa0afad589e149e541d157fe8658..12a078eded34f28bfb0a5721ebcb674e1fedf62c 100644
--- a/ui/packages/shared/pages/Configuration/useForm.ts
+++ b/ui/packages/shared/pages/Configuration/useForm.ts
@@ -87,13 +87,18 @@ export const useForm = (onSubmit: (values: FormValues) => void) => {
     ...(formik.values.databases && {
       db_list: formatDatabaseArray(formik.values.databases),
     }),
+    ...(formik.values.dockerImageType === 'custom' && {
+      dockerImage: formik.values.dockerImage,
+    }),
   }
 
   const isConnectionDataValid =
     formik.values.host &&
     formik.values.port &&
     formik.values.username &&
-    formik.values.dbname
+    formik.values.dbname &&
+    formik.values.dockerImageType === 'custom' &&
+    formik.values.dockerImage
 
   return [{ formik, connectionData, isConnectionDataValid }]
 }