diff --git a/frontend/.eslintrc b/frontend/.eslintrc
index 8593e9f61..21ef60f75 100644
--- a/frontend/.eslintrc
+++ b/frontend/.eslintrc
@@ -268,7 +268,7 @@
     "react/jsx-curly-spacing": [2, "never"],
     "react/jsx-equals-spacing": [2, "never"],
     "react/jsx-indent-props": [2, 2],
-    "react/jsx-indent": [2, 2],
+    "react/jsx-indent": [2, 2, { "indentLogicalExpressions": true }],
     "react/jsx-key": 2,
     "react/jsx-no-bind": [2, { "allowArrowFunctions": true }],
     "react/jsx-no-duplicate-props": [2, { "ignoreCase": true }],
diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
index 0c18c644b..019885ce5 100644
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js
@@ -88,27 +88,27 @@ class AddNewMovieSearchResult extends Component {
 
               {
                 !title.contains(year) && !!year &&
-                <span className={styles.year}>({year})</span>
+                  <span className={styles.year}>({year})</span>
               }
 
               {
                 isExistingMovie &&
-                <Icon
-                  className={styles.alreadyExistsIcon}
-                  name={icons.CHECK_CIRCLE}
-                  size={36}
-                  title="Already in your library"
-                />
+                  <Icon
+                    className={styles.alreadyExistsIcon}
+                    name={icons.CHECK_CIRCLE}
+                    size={36}
+                    title="Already in your library"
+                  />
               }
 
               {
                 isExclusionMovie &&
-                <Icon
-                  className={styles.exclusionIcon}
-                  name={icons.DANGER}
-                  size={36}
-                  title="Movie is on Net Import Exclusion List"
-                />
+                  <Icon
+                    className={styles.exclusionIcon}
+                    name={icons.DANGER}
+                    size={36}
+                    title="Movie is on Net Import Exclusion List"
+                  />
               }
             </div>
 
@@ -122,19 +122,19 @@ class AddNewMovieSearchResult extends Component {
 
               {
                 !!studio &&
-                <Label size={sizes.LARGE}>
-                  {studio}
-                </Label>
+                  <Label size={sizes.LARGE}>
+                    {studio}
+                  </Label>
               }
 
               {
                 status === 'ended' &&
-                <Label
-                  kind={kinds.DANGER}
-                  size={sizes.LARGE}
-                >
-                  Ended
-                </Label>
+                  <Label
+                    kind={kinds.DANGER}
+                    size={sizes.LARGE}
+                  >
+                    Ended
+                  </Label>
               }
             </div>
 
diff --git a/frontend/src/App/AppRoutes.js b/frontend/src/App/AppRoutes.js
index ce0ba11a3..d3052ed9e 100644
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -53,19 +53,19 @@ function AppRoutes(props) {
 
       {
         window.Radarr.urlBase &&
-        <Route
-          exact={true}
-          path="/"
-          addUrlBase={false}
-          render={() => {
-            return (
-              <Redirect
-                to={getPathWithUrlBase('/')}
-                component={app}
-              />
-            );
-          }}
-        />
+          <Route
+            exact={true}
+            path="/"
+            addUrlBase={false}
+            render={() => {
+              return (
+                <Redirect
+                  to={getPathWithUrlBase('/')}
+                  component={app}
+                />
+              );
+            }}
+          />
       }
 
       <Route
diff --git a/frontend/src/Calendar/CalendarPage.js b/frontend/src/Calendar/CalendarPage.js
index c70182c98..114077b2b 100644
--- a/frontend/src/Calendar/CalendarPage.js
+++ b/frontend/src/Calendar/CalendarPage.js
@@ -134,9 +134,9 @@ class CalendarPage extends Component {
         >
           {
             movieError &&
-            <div className={styles.errorMessage}>
-              {getErrorMessage(movieError, 'Failed to load movie from API')}
-            </div>
+              <div className={styles.errorMessage}>
+                {getErrorMessage(movieError, 'Failed to load movie from API')}
+              </div>
           }
 
           {
diff --git a/frontend/src/Movie/History/MovieHistoryTableContent.js b/frontend/src/Movie/History/MovieHistoryTableContent.js
index 0f2e44769..2a914dcbf 100644
--- a/frontend/src/Movie/History/MovieHistoryTableContent.js
+++ b/frontend/src/Movie/History/MovieHistoryTableContent.js
@@ -78,21 +78,21 @@ class MovieHistoryTableContent extends Component {
 
         {
           isPopulated && hasItems && !error &&
-          <Table columns={columns}>
-            <TableBody>
-              {
-                items.reverse().map((item) => {
-                  return (
-                    <MovieHistoryRowConnector
-                      key={item.id}
-                      {...item}
-                      onMarkAsFailedPress={onMarkAsFailedPress}
-                    />
-                  );
-                })
-              }
-            </TableBody>
-          </Table>
+            <Table columns={columns}>
+              <TableBody>
+                {
+                  items.reverse().map((item) => {
+                    return (
+                      <MovieHistoryRowConnector
+                        key={item.id}
+                        {...item}
+                        onMarkAsFailedPress={onMarkAsFailedPress}
+                      />
+                    );
+                  })
+                }
+              </TableBody>
+            </Table>
         }
       </div>
     );
diff --git a/frontend/src/Movie/Titles/MovieTitlesTableContent.js b/frontend/src/Movie/Titles/MovieTitlesTableContent.js
index 6854c1f05..1d00035f8 100644
--- a/frontend/src/Movie/Titles/MovieTitlesTableContent.js
+++ b/frontend/src/Movie/Titles/MovieTitlesTableContent.js
@@ -51,20 +51,20 @@ class MovieTitlesTableContent extends Component {
 
         {
           isPopulated && hasItems && !error &&
-          <Table columns={columns}>
-            <TableBody>
-              {
-                items.reverse().map((item) => {
-                  return (
-                    <MovieTitlesRow
-                      key={item.id}
-                      {...item}
-                    />
-                  );
-                })
-              }
-            </TableBody>
-          </Table>
+            <Table columns={columns}>
+              <TableBody>
+                {
+                  items.reverse().map((item) => {
+                    return (
+                      <MovieTitlesRow
+                        key={item.id}
+                        {...item}
+                      />
+                    );
+                  })
+                }
+              </TableBody>
+            </Table>
         }
       </div>
     );
diff --git a/frontend/src/Settings/General/ProxySettings.js b/frontend/src/Settings/General/ProxySettings.js
index 238cf3a30..5667abd0c 100644
--- a/frontend/src/Settings/General/ProxySettings.js
+++ b/frontend/src/Settings/General/ProxySettings.js
@@ -44,91 +44,91 @@ function ProxySettings(props) {
 
       {
         proxyEnabled.value &&
-        <div>
-          <FormGroup>
-            <FormLabel>Proxy Type</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.SELECT}
-              name="proxyType"
-              values={proxyTypeOptions}
-              onChange={onInputChange}
-              {...proxyType}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>Hostname</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.TEXT}
-              name="proxyHostname"
-
-              onChange={onInputChange}
-              {...proxyHostname}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>Port</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.NUMBER}
-              name="proxyPort"
-              min={1}
-              max={65535}
-              onChange={onInputChange}
-              {...proxyPort}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>Username</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.TEXT}
-              name="proxyUsername"
-              helpText="You only need to enter a username and password if one is required. Leave them blank otherwise."
-              onChange={onInputChange}
-              {...proxyUsername}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>Password</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.PASSWORD}
-              name="proxyPassword"
-              helpText="You only need to enter a username and password if one is required. Leave them blank otherwise."
-              onChange={onInputChange}
-              {...proxyPassword}
-            />
-          </FormGroup>
-
-          <FormGroup>
-            <FormLabel>Ignored Addresses</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.TEXT}
-              name="proxyBypassFilter"
-              helpText="Use ',' as a separator, and '*.' as a wildcard for subdomains"
-              onChange={onInputChange}
-              {...proxyBypassFilter}
-            />
-          </FormGroup>
-
-          <FormGroup size={sizes.MEDIUM}>
-            <FormLabel>Bypass Proxy for Local Addresses</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="proxyBypassLocalAddresses"
-              onChange={onInputChange}
-              {...proxyBypassLocalAddresses}
-            />
-          </FormGroup>
-        </div>
+          <div>
+            <FormGroup>
+              <FormLabel>Proxy Type</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.SELECT}
+                name="proxyType"
+                values={proxyTypeOptions}
+                onChange={onInputChange}
+                {...proxyType}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>Hostname</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.TEXT}
+                name="proxyHostname"
+
+                onChange={onInputChange}
+                {...proxyHostname}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>Port</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.NUMBER}
+                name="proxyPort"
+                min={1}
+                max={65535}
+                onChange={onInputChange}
+                {...proxyPort}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>Username</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.TEXT}
+                name="proxyUsername"
+                helpText="You only need to enter a username and password if one is required. Leave them blank otherwise."
+                onChange={onInputChange}
+                {...proxyUsername}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>Password</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.PASSWORD}
+                name="proxyPassword"
+                helpText="You only need to enter a username and password if one is required. Leave them blank otherwise."
+                onChange={onInputChange}
+                {...proxyPassword}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>Ignored Addresses</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.TEXT}
+                name="proxyBypassFilter"
+                helpText="Use ',' as a separator, and '*.' as a wildcard for subdomains"
+                onChange={onInputChange}
+                {...proxyBypassFilter}
+              />
+            </FormGroup>
+
+            <FormGroup size={sizes.MEDIUM}>
+              <FormLabel>Bypass Proxy for Local Addresses</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="proxyBypassLocalAddresses"
+                onChange={onInputChange}
+                {...proxyBypassLocalAddresses}
+              />
+            </FormGroup>
+          </div>
       }
     </FieldSet>
   );
diff --git a/frontend/src/Settings/General/SecuritySettings.js b/frontend/src/Settings/General/SecuritySettings.js
index cacd000ab..6a5204230 100644
--- a/frontend/src/Settings/General/SecuritySettings.js
+++ b/frontend/src/Settings/General/SecuritySettings.js
@@ -93,32 +93,32 @@ class SecuritySettings extends Component {
 
         {
           authenticationEnabled &&
-          <FormGroup>
-            <FormLabel>Username</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.TEXT}
-              name="username"
-              helpTextWarning="Requires restart to take effect"
-              onChange={onInputChange}
-              {...username}
-            />
-          </FormGroup>
+            <FormGroup>
+              <FormLabel>Username</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.TEXT}
+                name="username"
+                helpTextWarning="Requires restart to take effect"
+                onChange={onInputChange}
+                {...username}
+              />
+            </FormGroup>
         }
 
         {
           authenticationEnabled &&
-          <FormGroup>
-            <FormLabel>Password</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.PASSWORD}
-              name="password"
-              helpTextWarning="Requires restart to take effect"
-              onChange={onInputChange}
-              {...password}
-            />
-          </FormGroup>
+            <FormGroup>
+              <FormLabel>Password</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.PASSWORD}
+                name="password"
+                helpTextWarning="Requires restart to take effect"
+                onChange={onInputChange}
+                {...password}
+              />
+            </FormGroup>
         }
 
         <FormGroup>
diff --git a/frontend/src/Settings/General/UpdateSettings.js b/frontend/src/Settings/General/UpdateSettings.js
index ea5af62f2..f50ff1a7c 100644
--- a/frontend/src/Settings/General/UpdateSettings.js
+++ b/frontend/src/Settings/General/UpdateSettings.js
@@ -50,58 +50,58 @@ function UpdateSettings(props) {
 
       {
         !isWindows &&
-        <div>
-          <FormGroup
-            advancedSettings={advancedSettings}
-            isAdvanced={true}
-            size={sizes.MEDIUM}
-          >
-            <FormLabel>Automatic</FormLabel>
-
-            <FormInputGroup
-              type={inputTypes.CHECK}
-              name="updateAutomatically"
-              helpText="Automatically download and install updates. You will still be able to install from System: Updates"
-              onChange={onInputChange}
-              {...updateAutomatically}
-            />
-          </FormGroup>
-
-          <FormGroup
-            advancedSettings={advancedSettings}
-            isAdvanced={true}
-          >
-            <FormLabel>Mechanism</FormLabel>
+          <div>
+            <FormGroup
+              advancedSettings={advancedSettings}
+              isAdvanced={true}
+              size={sizes.MEDIUM}
+            >
+              <FormLabel>Automatic</FormLabel>
 
-            <FormInputGroup
-              type={inputTypes.SELECT}
-              name="updateMechanism"
-              values={updateOptions}
-              helpText="Use Radarr's built-in updater or a script"
-              helpLink="https://github.com/Radarr/Radarr/wiki/Updating"
-              onChange={onInputChange}
-              {...updateMechanism}
-            />
-          </FormGroup>
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="updateAutomatically"
+                helpText="Automatically download and install updates. You will still be able to install from System: Updates"
+                onChange={onInputChange}
+                {...updateAutomatically}
+              />
+            </FormGroup>
 
-          {
-            updateMechanism.value === 'script' &&
             <FormGroup
               advancedSettings={advancedSettings}
               isAdvanced={true}
             >
-              <FormLabel>Script Path</FormLabel>
+              <FormLabel>Mechanism</FormLabel>
 
               <FormInputGroup
-                type={inputTypes.TEXT}
-                name="updateScriptPath"
-                helpText="Path to a custom script that takes an extracted update package and handle the remainder of the update process"
+                type={inputTypes.SELECT}
+                name="updateMechanism"
+                values={updateOptions}
+                helpText="Use Radarr's built-in updater or a script"
+                helpLink="https://github.com/Radarr/Radarr/wiki/Updating"
                 onChange={onInputChange}
-                {...updateScriptPath}
+                {...updateMechanism}
               />
             </FormGroup>
-          }
-        </div>
+
+            {
+              updateMechanism.value === 'script' &&
+                <FormGroup
+                  advancedSettings={advancedSettings}
+                  isAdvanced={true}
+                >
+                  <FormLabel>Script Path</FormLabel>
+
+                  <FormInputGroup
+                    type={inputTypes.TEXT}
+                    name="updateScriptPath"
+                    helpText="Path to a custom script that takes an extracted update package and handle the remainder of the update process"
+                    onChange={onInputChange}
+                    {...updateScriptPath}
+                  />
+                </FormGroup>
+            }
+          </div>
       }
     </FieldSet>
   );
diff --git a/frontend/src/Settings/Indexers/Indexers/Indexer.js b/frontend/src/Settings/Indexers/Indexers/Indexer.js
index 9269f8532..8d7e5719d 100644
--- a/frontend/src/Settings/Indexers/Indexers/Indexer.js
+++ b/frontend/src/Settings/Indexers/Indexers/Indexer.js
@@ -96,12 +96,12 @@ class Indexer extends Component {
 
           {
             !enableRss && !enableAutomaticSearch && !enableInteractiveSearch &&
-            <Label
-              kind={kinds.DISABLED}
-              outline={true}
-            >
-              Disabled
-            </Label>
+              <Label
+                kind={kinds.DISABLED}
+                outline={true}
+              >
+                Disabled
+              </Label>
           }
         </div>
 
diff --git a/frontend/src/Settings/MediaManagement/MediaManagement.js b/frontend/src/Settings/MediaManagement/MediaManagement.js
index e4794631d..a52082635 100644
--- a/frontend/src/Settings/MediaManagement/MediaManagement.js
+++ b/frontend/src/Settings/MediaManagement/MediaManagement.js
@@ -64,9 +64,9 @@ class MediaManagement extends Component {
 
           {
             !isFetching && error &&
-            <FieldSet legend="Naming Settings">
-              <div>Unable to load Media Management settings</div>
-            </FieldSet>
+              <FieldSet legend="Naming Settings">
+                <div>Unable to load Media Management settings</div>
+              </FieldSet>
           }
 
           {
diff --git a/frontend/src/Settings/NetImport/NetImport/NetImport.js b/frontend/src/Settings/NetImport/NetImport/NetImport.js
index 0969d72c7..3816a17bb 100644
--- a/frontend/src/Settings/NetImport/NetImport/NetImport.js
+++ b/frontend/src/Settings/NetImport/NetImport/NetImport.js
@@ -86,12 +86,12 @@ class NetImport extends Component {
 
           {
             !enabled && !enableAuto &&
-            <Label
-              kind={kinds.DISABLED}
-              outline={true}
-            >
-              Disabled
-            </Label>
+              <Label
+                kind={kinds.DISABLED}
+                outline={true}
+              >
+                Disabled
+              </Label>
           }
         </div>
 
diff --git a/frontend/src/Settings/Notifications/Notifications/Notification.js b/frontend/src/Settings/Notifications/Notifications/Notification.js
index c1db80cc5..0c326668c 100644
--- a/frontend/src/Settings/Notifications/Notifications/Notification.js
+++ b/frontend/src/Settings/Notifications/Notifications/Notification.js
@@ -106,9 +106,9 @@ class Notification extends Component {
 
         {
           supportsOnHealthIssue && onHealthIssue &&
-          <Label kind={kinds.SUCCESS}>
-            On Health Issue
-          </Label>
+            <Label kind={kinds.SUCCESS}>
+              On Health Issue
+            </Label>
         }
 
         {
diff --git a/frontend/src/System/Events/LogsTable.js b/frontend/src/System/Events/LogsTable.js
index ce6d0c995..b089d4b19 100644
--- a/frontend/src/System/Events/LogsTable.js
+++ b/frontend/src/System/Events/LogsTable.js
@@ -76,45 +76,45 @@ function LogsTable(props) {
       <PageContentBodyConnector>
         {
           isFetching && !isPopulated &&
-          <LoadingIndicator />
+            <LoadingIndicator />
         }
 
         {
           isPopulated && !error && !items.length &&
-          <div>
-                No logs found
-          </div>
+            <div>
+                  No logs found
+            </div>
         }
 
         {
           isPopulated && !error && !!items.length &&
-          <div>
-            <Table
-              columns={columns}
-              canModifyColumns={false}
-              {...otherProps}
-            >
-              <TableBody>
-                {
-                  items.map((item) => {
-                    return (
-                      <LogsTableRow
-                        key={item.id}
-                        columns={columns}
-                        {...item}
-                      />
-                    );
-                  })
-                }
-              </TableBody>
-            </Table>
+            <div>
+              <Table
+                columns={columns}
+                canModifyColumns={false}
+                {...otherProps}
+              >
+                <TableBody>
+                  {
+                    items.map((item) => {
+                      return (
+                        <LogsTableRow
+                          key={item.id}
+                          columns={columns}
+                          {...item}
+                        />
+                      );
+                    })
+                  }
+                </TableBody>
+              </Table>
 
-            <TablePager
-              totalRecords={totalRecords}
-              isFetching={isFetching}
-              {...otherProps}
-            />
-          </div>
+              <TablePager
+                totalRecords={totalRecords}
+                isFetching={isFetching}
+                {...otherProps}
+              />
+            </div>
         }
       </PageContentBodyConnector>
     </PageContent>
diff --git a/frontend/src/System/Tasks/Queued/QueuedTasks.js b/frontend/src/System/Tasks/Queued/QueuedTasks.js
index a2fd526fa..e856df532 100644
--- a/frontend/src/System/Tasks/Queued/QueuedTasks.js
+++ b/frontend/src/System/Tasks/Queued/QueuedTasks.js
@@ -54,27 +54,27 @@ function QueuedTasks(props) {
     <FieldSet legend="Queue">
       {
         isFetching && !isPopulated &&
-        <LoadingIndicator />
+          <LoadingIndicator />
       }
 
       {
         isPopulated &&
-        <Table
-          columns={columns}
-        >
-          <TableBody>
-            {
-              items.map((item) => {
-                return (
-                  <QueuedTaskRowConnector
-                    key={item.id}
-                    {...item}
-                  />
-                );
-              })
-            }
-          </TableBody>
-        </Table>
+          <Table
+            columns={columns}
+          >
+            <TableBody>
+              {
+                items.map((item) => {
+                  return (
+                    <QueuedTaskRowConnector
+                      key={item.id}
+                      {...item}
+                    />
+                  );
+                })
+              }
+            </TableBody>
+          </Table>
       }
     </FieldSet>
   );
diff --git a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js
index 7c6fe8a32..9dbb72f4d 100644
--- a/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js
+++ b/frontend/src/System/Tasks/Scheduled/ScheduledTasks.js
@@ -44,27 +44,27 @@ function ScheduledTasks(props) {
     <FieldSet legend="Scheduled">
       {
         isFetching && !isPopulated &&
-        <LoadingIndicator />
+          <LoadingIndicator />
       }
 
       {
         isPopulated &&
-        <Table
-          columns={columns}
-        >
-          <TableBody>
-            {
-              items.map((item) => {
-                return (
-                  <ScheduledTaskRowConnector
-                    key={item.id}
-                    {...item}
-                  />
-                );
-              })
-            }
-          </TableBody>
-        </Table>
+          <Table
+            columns={columns}
+          >
+            <TableBody>
+              {
+                items.map((item) => {
+                  return (
+                    <ScheduledTaskRowConnector
+                      key={item.id}
+                      {...item}
+                    />
+                  );
+                })
+              }
+            </TableBody>
+          </Table>
       }
     </FieldSet>
   );
diff --git a/frontend/src/System/Updates/Updates.js b/frontend/src/System/Updates/Updates.js
index 05623f64d..2e872eb68 100644
--- a/frontend/src/System/Updates/Updates.js
+++ b/frontend/src/System/Updates/Updates.js
@@ -55,14 +55,14 @@ class Updates extends Component {
               <div className={styles.updateAvailable}>
                 {
                   !isDocker &&
-                  <SpinnerButton
-                    className={styles.updateAvailable}
-                    kind={kinds.PRIMARY}
-                    isSpinning={isInstallingUpdate}
-                    onPress={onInstallLatestPress}
-                  >
-                    Install Latest
-                  </SpinnerButton>
+                    <SpinnerButton
+                      className={styles.updateAvailable}
+                      kind={kinds.PRIMARY}
+                      isSpinning={isInstallingUpdate}
+                      onPress={onInstallLatestPress}
+                    >
+                      Install Latest
+                    </SpinnerButton>
                 }
 
                 {