diff --git a/static/app-strings.json b/static/app-strings.json
index ec678cb98..6f6a62448 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -909,7 +909,6 @@
   "Choose a different provider's wallet server.": "Choose a different provider's wallet server.",
   "Host": "Host",
   "Port": "Port",
-  "Available": "Available",
   "Unable to load your saved preferences.": "Unable to load your saved preferences.",
   "Add/Delete": "Add/Delete",
   "%numberOfMonthsSincePublish% years ago": "%numberOfMonthsSincePublish% years ago",
@@ -919,12 +918,11 @@
   "%numberOfMonthsSincePublish% month ago": "%numberOfMonthsSincePublish% month ago",
   "%numberOfMonthsSincePublish% months ago": "%numberOfMonthsSincePublish% months ago",
   "%numberOfDaysSincePublish% days ago": "%numberOfDaysSincePublish% days ago",
+  "%numberOfDaysSincePublish% day ago": "%numberOfDaysSincePublish% day ago",
   "The wallet server took a bit too long. Resetting defaults just in case. Shutdown (Cmd/Ctrl+Q) LBRY and restart if this continues.": "The wallet server took a bit too long. Resetting defaults just in case. Shutdown (Cmd/Ctrl+Q) LBRY and restart if this continues.",
   "Provide a description and link to your license": "Provide a description and link to your license",
-  "Walletserver preference": "Walletserver preference",
   "Wallet servers": "Wallet servers",
   "In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications.": "In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications.",
   "Followers": "Followers",
-  "%numberOfDaysSincePublish% day ago": "%numberOfDaysSincePublish% day ago",
   "%number% files hidden due to your %content_viewing_preferences_link%": "%number% files hidden due to your %content_viewing_preferences_link%"
 }
diff --git a/ui/component/settingWalletServer/internal/inputRow.jsx b/ui/component/settingWalletServer/internal/inputRow.jsx
index aaafda5a9..99f4038e2 100644
--- a/ui/component/settingWalletServer/internal/inputRow.jsx
+++ b/ui/component/settingWalletServer/internal/inputRow.jsx
@@ -1,47 +1,63 @@
 // @flow
-import * as ICONS from 'constants/icons';
 import React, { useState, useEffect } from 'react';
 import Button from 'component/button';
-import { FormField } from 'component/common/form';
+import { Form, FormField } from 'component/common/form';
 
 type Props = {
-  update: (string) => void,
+  update: ([string, string]) => void,
 };
 
-const VALID_IPADDRESS_REGEX = new RegExp('^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\.)){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$');
-const VALID_HOSTNAME_REGEX = new RegExp('^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(\\.))+([A-Za-z]|[A-Za-z][A-Za-z]*[A-Za-z])$');
+const VALID_IPADDRESS_REGEX = new RegExp(
+  '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\.)){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$'
+);
+const VALID_HOSTNAME_REGEX = new RegExp(
+  '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(\\.))+([A-Za-z]|[A-Za-z][A-Za-z]*[A-Za-z])$'
+);
 const VALID_PORT_REGEX = new RegExp('^([0-9]){1,5}$');
 
 function ServerInputRow(props: Props) {
   const { update } = props;
-
   const [hostString, setHostString] = useState('');
   const [portString, setPortString] = useState('');
   const [validServerString, setValidServerString] = useState(false);
 
   useEffect(() => {
-    setValidServerString((VALID_IPADDRESS_REGEX.test(hostString) || VALID_HOSTNAME_REGEX.test(hostString)) && VALID_PORT_REGEX.test(portString));
+    setValidServerString(
+      (VALID_IPADDRESS_REGEX.test(hostString) || VALID_HOSTNAME_REGEX.test(hostString)) &&
+        VALID_PORT_REGEX.test(portString)
+    );
   }, [hostString, portString, validServerString, setValidServerString]);
 
-  function onClick() {
+  function onSubmit() {
     update([hostString, portString]);
     setHostString('');
     setPortString('');
   }
 
   return (
-    <tr>
-      <td>
-        <FormField type="text" value={hostString} onChange={e => setHostString(e.target.value)} />
-      </td>
-      <td>
-        <FormField type="text" value={portString} onChange={e => setPortString(e.target.value)} />
-      </td>
-      <td />
-      <td>
-        <Button button={'link'} icon={ICONS.ADD} disabled={!validServerString} onClick={onClick} />
-      </td>
-    </tr>
+    <Form onSubmit={onSubmit}>
+      <div className="section__actions">
+        <FormField
+          type="text"
+          label={__('Host')}
+          placeholder={'code.freezepeach.fun'}
+          value={hostString}
+          onChange={e => setHostString(e.target.value)}
+        />
+        <span className="form-field__conjuction">:</span>
+        <FormField
+          type="text"
+          label={__('Port')}
+          placeholder={'50001'}
+          value={portString}
+          onChange={e => setPortString(e.target.value)}
+        />
+      </div>
+
+      <div className="section__actions">
+        <Button type="submit" button="primary" label={__('Add')} disabled={!validServerString} />
+      </div>
+    </Form>
   );
 }
 
diff --git a/ui/component/settingWalletServer/view.jsx b/ui/component/settingWalletServer/view.jsx
index f0eb7b346..8b7cc5bec 100644
--- a/ui/component/settingWalletServer/view.jsx
+++ b/ui/component/settingWalletServer/view.jsx
@@ -4,12 +4,11 @@ import React, { useState, useEffect } from 'react';
 import { FormField } from 'component/common/form';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
-import Icon from 'component/common/icon';
 
 import ServerInputRow from './internal/inputRow';
 
 type DaemonSettings = {
-  lbryum_servers: Array<>,
+  lbryum_servers: Array<string>,
 };
 
 type DaemonStatus = {
@@ -33,7 +32,7 @@ type Props = {
   setCustomWalletServers: any => void,
   clearWalletServers: () => void,
   customWalletServers: ServerConfig,
-  saveServerConfig: string => void,
+  saveServerConfig: (Array<string>) => void,
   fetchDaemonSettings: () => void,
   hasWalletServerPrefs: boolean,
   daemonStatus: DaemonStatus,
@@ -88,13 +87,13 @@ function SettingWalletServer(props: Props) {
     clearWalletServers();
   }
 
-  function onAdd(serverTuple) {
+  function onAdd(serverTuple: Array<string>) {
     let newServerConfig = serverConfig.concat();
     newServerConfig.push(serverTuple);
     updateServers(newServerConfig);
   }
 
-  function onDelete(i) {
+  function onDelete(i: number) {
     const newServerConfig = serverConfig.concat();
     newServerConfig.splice(i, 1);
     updateServers(newServerConfig);
@@ -107,13 +106,12 @@ function SettingWalletServer(props: Props) {
 
   return (
     <React.Fragment>
-      <label>{__('Wallet servers')}</label>
-      <fieldset>
+      <fieldset-section>
         <FormField
           type="radio"
           name="default_wallet_servers"
           checked={!advancedMode}
-          label={__('lbry.tv')}
+          label={__('Use official lbry.tv wallet servers')}
           onChange={e => {
             if (e.target.checked) {
               doClear();
@@ -130,42 +128,41 @@ function SettingWalletServer(props: Props) {
               setCustomWalletServers(makeServerParam(customWalletServers));
             }
           }}
-          label={__('customize')}
+          label={__('Use custom wallet servers')}
         />
-      </fieldset>
-      {advancedMode && (
-        <div>
-          <table className="table table--transactions">
-            <thead>
-              <tr>
-                <th>{__('Host')}</th>
-                <th>{__('Port')} </th>
-                <th>{__('Available')} </th>
-                <th>{__('Add/Delete')} </th>
-              </tr>
-            </thead>
-            <tbody>
-              {serverConfig &&
-                serverConfig.map((entry, i) => (
-                  <tr key={`${entry[0]}:${entry[1]}`}>
-                    <td>{entry[0]}</td>
-                    <td>{entry[1]}</td>
-                    <td>
-                      {activeWalletServers.some(
-                        s => s.host === entry[0] && String(s.port) === entry[1] && s.availability
-                      ) && <Icon icon={ICONS.SUBSCRIBE} />}
-                    </td>
-                    <td>
-                      <Button button={'link'} icon={ICONS.REMOVE} onClick={() => onDelete(i)} />
-                    </td>
-                  </tr>
-                ))}
+        {advancedMode && (
+          <div>
+            {serverConfig &&
+              serverConfig.map((entry, index) => {
+                const [host, port] = entry;
+                const available = activeWalletServers.some(
+                  s => s.host === entry[0] && String(s.port) === entry[1] && s.availability
+                );
+
+                return (
+                  <div
+                    key={`${host}:${port}`}
+                    className="section section--padded card--inline form-field__internal-option"
+                  >
+                    <h3>
+                      {host}:{port}
+                    </h3>
+                    <span className="help">{available ? 'Connected' : 'Not connected'}</span>
+                    <Button
+                      button="close"
+                      title={__('Remove custom wallet server')}
+                      icon={ICONS.REMOVE}
+                      onClick={() => onDelete(index)}
+                    />
+                  </div>
+                );
+              })}
+            <div className="form-field__internal-option">
               <ServerInputRow update={onAdd} />
-            </tbody>
-          </table>
-        </div>
-      )}
-      <p className="help">{__(`Choose a different provider's wallet server.`)}</p>
+            </div>
+          </div>
+        )}
+      </fieldset-section>
     </React.Fragment>
   );
 }
diff --git a/ui/component/splash/view.jsx b/ui/component/splash/view.jsx
index d93799c78..c5e93ff93 100644
--- a/ui/component/splash/view.jsx
+++ b/ui/component/splash/view.jsx
@@ -39,10 +39,7 @@ type State = {
   error: boolean,
   isRunning: boolean,
   launchWithIncompatibleDaemon: boolean,
-  walletServerAvailable: boolean,
   waitingForWallet: number,
-  hasPopulated: boolean,
-  hasReconnected: boolean,
 };
 
 export default class SplashScreen extends React.PureComponent<Props, State> {
@@ -129,8 +126,12 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
         });
       } else if (this.state.waitingForWallet > MAX_WALLET_WAIT && launchedModal === false && !modal) {
         clearWalletServers();
-        doShowSnackBar(__('The wallet server took a bit too long. Resetting defaults just in case. Shutdown (Cmd/Ctrl+Q) LBRY and restart if this continues.'));
-        this.setState({waitingForWallet: 0});
+        doShowSnackBar(
+          __(
+            'The wallet server took a bit too long. Resetting defaults just in case. Shutdown (Cmd/Ctrl+Q) LBRY and restart if this continues.'
+          )
+        );
+        this.setState({ waitingForWallet: 0 });
         this.updateStatusCallback(status);
       } else {
         this.updateStatusCallback(status);
@@ -151,7 +152,7 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
       this.hasRecordedUser = true;
     }
 
-    const { wallet, startup_status: startupStatus, blockchain_headers: blockchainHeaders } = status;
+    const { wallet, startup_status: startupStatus } = status;
 
     // If the wallet is locked, stop doing anything and make the user input their password
     if (status.is_running && !waitingForUnlock) {
@@ -161,7 +162,7 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
 
       return;
     } else if (startupStatus && !startupStatus.wallet && wallet && wallet.available_servers < 1) {
-      this.setState({waitingForWallet: this.state.waitingForWallet + (UPDATE_INTERVAL / 1000)});
+      this.setState({ waitingForWallet: this.state.waitingForWallet + UPDATE_INTERVAL / 1000 });
     } else if (wallet && wallet.blocks_behind > 0) {
       this.setState({
         message: __('Blockchain Sync'),
diff --git a/ui/scss/component/_form-field.scss b/ui/scss/component/_form-field.scss
index f48d1ac0c..7d3c7569e 100644
--- a/ui/scss/component/_form-field.scss
+++ b/ui/scss/component/_form-field.scss
@@ -103,12 +103,6 @@ fieldset-group {
   cursor: default;
 }
 
-.form-field__help {
-  @extend .help;
-  margin-top: var(--spacing-miniscule);
-  margin-bottom: var(--spacing-small);
-}
-
 .form-field--short {
   width: 25em;
 }
@@ -120,3 +114,24 @@ fieldset-group {
 .form-field--address {
   min-width: 18em;
 }
+
+.form-field__help {
+  @extend .help;
+  margin-top: var(--spacing-miniscule);
+  margin-bottom: var(--spacing-small);
+}
+
+.form-field__conjuction {
+  padding-top: 1rem;
+}
+
+fieldset-section {
+  .form-field__internal-option {
+    margin-top: var(--spacing-small);
+    margin-left: 2.2rem;
+
+    &:first-of-type {
+      margin-top: var(--spacing-small); // Extra specificity needed here since _section.scss is applied after this file
+    }
+  }
+}
diff --git a/ui/scss/component/section.scss b/ui/scss/component/section.scss
index 08d224cfd..7c75a0125 100644
--- a/ui/scss/component/section.scss
+++ b/ui/scss/component/section.scss
@@ -1,4 +1,5 @@
 .section {
+  position: relative;
   margin-top: var(--spacing-large);
 
   &:first-of-type {
diff --git a/ui/scss/init/_gui.scss b/ui/scss/init/_gui.scss
index 80d74bdaa..0df31470d 100644
--- a/ui/scss/init/_gui.scss
+++ b/ui/scss/init/_gui.scss
@@ -179,12 +179,6 @@ a {
   }
 }
 
-.card {
-  .help:last-child {
-    margin-bottom: 0;
-  }
-}
-
 .help {
   display: block;
   font-size: var(--font-small);
diff --git a/ui/store.js b/ui/store.js
index 3b8a170f7..25967f822 100644
--- a/ui/store.js
+++ b/ui/store.js
@@ -130,7 +130,7 @@ const sharedStateFilters = {
     },
   },
   blocked: { source: 'blocked', property: 'blockedChannels' },
-  settings: { source: 'settings', property: 'sharedPreferences'},
+  settings: { source: 'settings', property: 'sharedPreferences' },
 };
 
 const sharedStateCb = ({ dispatch, getState }) => {