diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.css b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.css
index a79efda26..13f35bed4 100644
--- a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.css
+++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.css
@@ -8,11 +8,15 @@
 }
 
 .host {
-  flex: 0 0 300px;
+  @add-mixin truncate;
+
+  flex: 0 1 300px;
 }
 
 .path {
-  flex: 0 0 400px;
+  @add-mixin truncate;
+
+  flex: 0 1 400px;
 }
 
 .actions {
diff --git a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.css b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.css
index 4ef9dcb0f..6d0079fd9 100644
--- a/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.css
+++ b/frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.css
@@ -5,11 +5,15 @@
 }
 
 .host {
-  flex: 0 0 300px;
+  @add-mixin truncate;
+
+  flex: 0 1 300px;
 }
 
 .path {
-  flex: 0 0 400px;
+  @add-mixin truncate;
+
+  flex: 0 1 400px;
 }
 
 .addRemotePathMapping {
diff --git a/frontend/src/Settings/General/HostSettings.js b/frontend/src/Settings/General/HostSettings.js
index 2d17dc09f..372fcf850 100644
--- a/frontend/src/Settings/General/HostSettings.js
+++ b/frontend/src/Settings/General/HostSettings.js
@@ -87,56 +87,59 @@ function HostSettings(props) {
       </FormGroup>
 
       {
-        enableSsl.value &&
-        <FormGroup
-          advancedSettings={advancedSettings}
-          isAdvanced={true}
-        >
-          <FormLabel>SSL Port</FormLabel>
-
-          <FormInputGroup
-            type={inputTypes.NUMBER}
-            name="sslPort"
-            min={1}
-            max={65535}
-            helpTextWarning="Requires restart to take effect"
-            onChange={onInputChange}
-            {...sslPort}
-          />
-        </FormGroup>
+        enableSsl.value ?
+          <FormGroup
+            advancedSettings={advancedSettings}
+            isAdvanced={true}
+          >
+            <FormLabel>SSL Port</FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.NUMBER}
+              name="sslPort"
+              min={1}
+              max={65535}
+              helpTextWarning="Requires restart to take effect"
+              onChange={onInputChange}
+              {...sslPort}
+            />
+          </FormGroup> :
+          null
       }
 
       {
-        isWindows && enableSsl.value &&
-        <FormGroup
-          advancedSettings={advancedSettings}
-          isAdvanced={true}
-        >
-          <FormLabel>SSL Cert Hash</FormLabel>
-
-          <FormInputGroup
-            type={inputTypes.TEXT}
-            name="sslCertHash"
-            helpTextWarning="Requires restart to take effect"
-            onChange={onInputChange}
-            {...sslCertHash}
-          />
-        </FormGroup>
+        isWindows && enableSsl.value ?
+          <FormGroup
+            advancedSettings={advancedSettings}
+            isAdvanced={true}
+          >
+            <FormLabel>SSL Cert Hash</FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.TEXT}
+              name="sslCertHash"
+              helpTextWarning="Requires restart to take effect"
+              onChange={onInputChange}
+              {...sslCertHash}
+            />
+          </FormGroup> :
+          null
       }
 
       {
-        mode !== 'service' &&
-        <FormGroup size={sizes.MEDIUM}>
-          <FormLabel>Open browser on start</FormLabel>
-
-          <FormInputGroup
-            type={inputTypes.CHECK}
-            name="launchBrowser"
-            helpText=" Open a web browser and navigate to Sonarr homepage on app start."
-            onChange={onInputChange}
-            {...launchBrowser}
-          />
-        </FormGroup>
+        isWindows && mode !== 'service' ?
+          <FormGroup size={sizes.MEDIUM}>
+            <FormLabel>Open browser on start</FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.CHECK}
+              name="launchBrowser"
+              helpText=" Open a web browser and navigate to Sonarr homepage on app start."
+              onChange={onInputChange}
+              {...launchBrowser}
+            />
+          </FormGroup> :
+          null
       }
 
     </FieldSet>