diff --git a/packages/web/src/index.css b/packages/web/src/index.css
index d420fc1f7..18ce2e20b 100644
--- a/packages/web/src/index.css
+++ b/packages/web/src/index.css
@@ -26,3 +26,27 @@ code {
 .icon-invisible {
   visibility: hidden;
 }
+
+.largeFormMarker input[type='text'] {
+  width: 100%;
+  padding: 10px 10px;
+  font-size: 14px;
+  box-sizing: border-box;
+  border-radius: 4px;
+}
+
+.largeFormMarker input[type='password'] {
+  width: 100%;
+  padding: 10px 10px;
+  font-size: 14px;
+  box-sizing: border-box;
+  border-radius: 4px;
+}
+
+.largeFormMarker select {
+  width: 100%;
+  padding: 10px 10px;
+  font-size: 14px;
+  box-sizing: border-box;
+  border-radius: 4px;
+}
diff --git a/packages/web/src/modals/ConnectionModal.js b/packages/web/src/modals/ConnectionModal.js
index 4c03ceb7c..76e7bae5d 100644
--- a/packages/web/src/modals/ConnectionModal.js
+++ b/packages/web/src/modals/ConnectionModal.js
@@ -21,8 +21,29 @@ import { TabControl, TabPage } from '../widgets/TabControl';
 import { usePlatformInfo } from '../utility/metadataLoaders';
 import getElectron from '../utility/getElectron';
 import { FormFieldTemplateLarge } from '../utility/formStyle';
+import styled from 'styled-components';
 // import FormikForm from '../utility/FormikForm';
 
+const FlexContainer = styled.div`
+  display: flex;
+`;
+
+const TestResultContainer = styled.div`
+  margin-left: 10px;
+  align-self: center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const ButtonsContainer = styled.div`
+  flex-shrink: 0;
+`;
+
+const AgentInfoWrap = styled.div`
+  margin-left: 20px;
+`;
+
 function DriverFields({ extensions }) {
   const { values, setFieldValue } = useForm();
   const { authType, engine } = values;
@@ -103,17 +124,6 @@ function SshTunnelFields() {
       <FormTextField label="Login" name="sshLogin" disabled={!useSshTunnel} />
 
       {sshMode == 'userPassword' && <FormPasswordField label="Password" name="sshPassword" disabled={!useSshTunnel} />}
-      {useSshTunnel &&
-        sshMode == 'agent' &&
-        (platformInfo.sshAuthSock ? (
-          <div>
-            <FontIcon icon="img ok" /> SSH Agent found
-          </div>
-        ) : (
-          <div>
-            <FontIcon icon="img error" /> SSH Agent not found
-          </div>
-        ))}
 
       {sshMode == 'keyFile' && (
         <FormElectronFileSelector label="Private key file" name="sshKeyfile" disabled={!useSshTunnel} />
@@ -122,6 +132,20 @@ function SshTunnelFields() {
       {sshMode == 'keyFile' && (
         <FormPasswordField label="Key file passphrase" name="sshKeyfilePassword" disabled={!useSshTunnel} />
       )}
+
+      {useSshTunnel && sshMode == 'agent' && (
+        <AgentInfoWrap>
+          {platformInfo.sshAuthSock ? (
+            <div>
+              <FontIcon icon="img ok" /> SSH Agent found
+            </div>
+          ) : (
+            <div>
+              <FontIcon icon="img error" /> SSH Agent not found
+            </div>
+          )}
+        </AgentInfoWrap>
+      )}
     </>
   );
 }
@@ -175,6 +199,26 @@ export default function ConnectionModal({ modalState, connection = undefined })
               </FormSelectField>
               <DriverFields extensions={extensions} />
               <FormTextField label="Display name" name="displayName" />
+            </TabPage>
+            <TabPage label="SSH Tunnel" key="sshTunnel">
+              <SshTunnelFields />
+            </TabPage>
+          </TabControl>
+        </ModalContent>
+
+        <ModalFooter>
+          <FlexContainer>
+            <ButtonsContainer>
+              {isTesting ? (
+                <FormButton value="Cancel" onClick={handleCancel} />
+              ) : (
+                <FormButton value="Test" onClick={handleTest} />
+              )}
+
+              <FormSubmit value="Save" onClick={handleSubmit} />
+            </ButtonsContainer>
+
+            <TestResultContainer>
               {!isTesting && sqlConnectResult && sqlConnectResult.msgtype == 'connected' && (
                 <div>
                   Connected: <FontIcon icon="img ok" /> {sqlConnectResult.version}
@@ -185,22 +229,13 @@ export default function ConnectionModal({ modalState, connection = undefined })
                   Connect failed: <FontIcon icon="img error" /> {sqlConnectResult.error}
                 </div>
               )}
-              {isTesting && <LoadingInfo message="Testing connection" />}
-            </TabPage>
-            <TabPage label="SSH Tunnel" key="sshTunnel">
-              <SshTunnelFields />
-            </TabPage>
-          </TabControl>
-        </ModalContent>
-
-        <ModalFooter>
-          {isTesting ? (
-            <FormButton value="Cancel" onClick={handleCancel} />
-          ) : (
-            <FormButton value="Test" onClick={handleTest} />
-          )}
-
-          <FormSubmit value="Save" onClick={handleSubmit} />
+              {isTesting && (
+                <div>
+                  <FontIcon icon="icon loading" /> Testing connection
+                </div>
+              )}
+            </TestResultContainer>
+          </FlexContainer>
         </ModalFooter>
       </FormProvider>
     </ModalBase>
diff --git a/packages/web/src/themes/ThemeHelmet.js b/packages/web/src/themes/ThemeHelmet.js
index 78704c6c9..4ebe05b99 100644
--- a/packages/web/src/themes/ThemeHelmet.js
+++ b/packages/web/src/themes/ThemeHelmet.js
@@ -50,6 +50,10 @@ export default function ThemeHelmet() {
           border: 1px solid ${theme.border};
         }
 
+        select[disabled] {
+          background-color: ${theme.input_background2};
+        }
+
         textarea {
           background-color: ${theme.input_background};
           color: ${theme.input_font1};
diff --git a/packages/web/src/utility/formStyle.js b/packages/web/src/utility/formStyle.js
index ea4143584..ff4369e50 100644
--- a/packages/web/src/utility/formStyle.js
+++ b/packages/web/src/utility/formStyle.js
@@ -14,10 +14,10 @@ export const FormLabel = styled.div`
 
 export const FormValue = styled.div``;
 
-export function FormFieldTemplateDefault({ label, children, type }) {
+export function FormFieldTemplateDefault({ label, children, onLabelClick, type }) {
   return (
     <FormRow>
-      <FormLabel>{label}</FormLabel>
+      <FormLabel onClick={onLabelClick}>{label}</FormLabel>
       <FormValue>{children}</FormValue>
     </FormRow>
   );
@@ -36,49 +36,51 @@ export const FormValueTiny = styled.div`
   margin-top: 3px;
 `;
 
-export function FormFieldTemplateTiny({ label, children, type }) {
+export function FormFieldTemplateTiny({ label, children, onLabelClick, type }) {
   const theme = useTheme();
   if (type == 'checkbox') {
     return (
       <FormRowTiny>
-        {children} {label}
+        {children} <span onClick={onLabelClick}>{label}</span>
       </FormRowTiny>
     );
   }
   return (
     <FormRowTiny>
-      <FormLabelTiny theme={theme}>{label}</FormLabelTiny>
+      <FormLabelTiny theme={theme} onClick={onLabelClick}>
+        {label}
+      </FormLabelTiny>
       <FormValueTiny>{children}</FormValueTiny>
     </FormRowTiny>
   );
 }
 
 export const FormRowLarge = styled.div`
-  margin: 5px;
+  margin: 20px;
 `;
 
 export const FormLabelLarge = styled.div`
+  margin-bottom: 3px;
   color: ${props => props.theme.manager_font3};
 `;
 
-export const FormValueLarge = styled.div`
-  margin-left: 15px;
-  margin-top: 3px;
-`;
+export const FormValueLarge = styled.div``;
 
-export function FormFieldTemplateLarge({ label, children, type }) {
+export function FormFieldTemplateLarge({ label, onLabelClick, children, type }) {
   const theme = useTheme();
   if (type == 'checkbox') {
     return (
-      <FormRowTiny>
-        {children} {label}
-      </FormRowTiny>
+      <FormRowLarge>
+        {children} <span onClick={onLabelClick}>{label}</span>
+      </FormRowLarge>
     );
   }
   return (
-    <FormRowTiny>
-      <FormLabelTiny theme={theme}>{label}</FormLabelTiny>
-      <FormValueTiny>{children}</FormValueTiny>
-    </FormRowTiny>
+    <FormRowLarge className="largeFormMarker">
+      <FormLabelLarge theme={theme} onClick={onLabelClick}>
+        {label}
+      </FormLabelLarge>
+      <FormValueLarge>{children}</FormValueLarge>
+    </FormRowLarge>
   );
 }
diff --git a/packages/web/src/utility/forms.js b/packages/web/src/utility/forms.js
index 0d6ef3c46..2ec24e24e 100644
--- a/packages/web/src/utility/forms.js
+++ b/packages/web/src/utility/forms.js
@@ -65,7 +65,7 @@ export function FormPasswordFieldRaw({ name, focused = false, ...other }) {
   const isCrypted = value && value.startsWith('crypt:');
 
   return (
-    <>
+    <FlexContainer>
       <TextField
         {...other}
         value={isCrypted ? '' : value}
@@ -74,9 +74,12 @@ export function FormPasswordFieldRaw({ name, focused = false, ...other }) {
         placeholder={isCrypted ? '(Password is encrypted)' : undefined}
         type={isCrypted || showPassword ? 'text' : 'password'}
       />
-
-      {!isCrypted && <FontIcon icon="icon eye" onClick={() => setShowPassword(x => !x)} />}
-    </>
+      {!isCrypted && (
+        <InlineButton onClick={() => setShowPassword(x => !x)}>
+          <FontIcon icon="icon eye" />
+        </InlineButton>
+      )}
+    </FlexContainer>
   );
 }
 
@@ -110,9 +113,10 @@ export function FormCheckboxFieldRaw({ name = undefined, defaultValue = undefine
 }
 
 export function FormCheckboxField({ label, ...other }) {
+  const { values, setFieldValue } = useForm();
   const FieldTemplate = useFormFieldTemplate();
   return (
-    <FieldTemplate label={label} type="checkbox">
+    <FieldTemplate label={label} type="checkbox" onLabelClick={() => setFieldValue(other.name, !values[other.name])}>
       <FormCheckboxFieldRaw {...other} />
     </FieldTemplate>
   );
@@ -329,7 +333,7 @@ export function FormArchiveFolderSelect({ name, additionalFolders = [], ...other
   );
 }
 
-export function FormElectronFileSelectorRaw({ name }) {
+export function FormElectronFileSelectorRaw({ name, ...other }) {
   const { values, setFieldValue } = useForm();
   const handleBrowse = () => {
     const electron = getElectron();
@@ -343,7 +347,7 @@ export function FormElectronFileSelectorRaw({ name }) {
   };
   return (
     <FlexContainer>
-      <TextField value={values[name]} onClick={handleBrowse} readOnly />
+      <TextField value={values[name]} onClick={handleBrowse} {...other} readOnly />
       <InlineButton onClick={handleBrowse}>Browse</InlineButton>
     </FlexContainer>
   );