diff --git a/app/src/components/Videos.js b/app/src/components/Videos.js
index 06e7182b..70f758aa 100644
--- a/app/src/components/Videos.js
+++ b/app/src/components/Videos.js
@@ -417,6 +417,17 @@ function VideosSettingsPage() {
                             />
                         </Grid.Column>
                     </Grid.Row>
+                    <Grid.Row>
+                        <Grid.Column mobile={16} computer={8}>
+                            <ToggleForm
+                                form={configForm}
+                                label={downloadMissingVideoCommentsLabel}
+                                name='download_missing_video_comments'
+                                path='download_missing_video_comments'
+                                icon='comments'
+                            />
+                        </Grid.Column>
+                    </Grid.Row>
                     <Grid.Row>
                         <Grid.Column mobile={16} computer={8}>
                             <InputForm
@@ -428,29 +439,7 @@ function VideosSettingsPage() {
                                 icon='terminal'
                             />
                         </Grid.Column>
-                    </Grid.Row>
-                    <Grid.Row>
-                        <Grid.Column mobile={16} computer={16}>
-                            <Form.Field>
-                                <InfoHeader
-                                    headerSize='h5'
-                                    headerContent='User Agent'
-                                    popupContent='Custom user-agent string for yt-dlp. Should match the browser used to export cookies. Click "Use Current Browser" to auto-fill with your browser&apos;s user-agent.'
-                                />
-                                <FormInput
-                                    value={configForm.formData.user_agent || ''}
-                                    onChange={(e) => configForm.setValue('user_agent', e.target.value)}
-                                    placeholder='Leave empty to use yt-dlp default'
-                                    action={{
-                                        content: 'Use Current Browser',
-                                        onClick: () => configForm.setValue('user_agent', suggestedUserAgent),
-                                    }}
-                                />
-                            </Form.Field>
-                        </Grid.Column>
-                    </Grid.Row>
-                    <Grid.Row>
-                        <Grid.Column mobile={16} computer={8}>
+                        <Grid.Column mobile={16} computer={4}>
                             <Form.Field>
                                 <InfoHeader
                                     headerSize='h5'
@@ -472,14 +461,23 @@ function VideosSettingsPage() {
                         </Grid.Column>
                     </Grid.Row>
                     <Grid.Row>
-                        <Grid.Column mobile={16} computer={8}>
-                            <ToggleForm
-                                form={configForm}
-                                label={downloadMissingVideoCommentsLabel}
-                                name='download_missing_video_comments'
-                                path='download_missing_video_comments'
-                                icon='comments'
-                            />
+                        <Grid.Column mobile={16} computer={16}>
+                            <Form.Field>
+                                <InfoHeader
+                                    headerSize='h5'
+                                    headerContent='User Agent'
+                                    popupContent='Custom user-agent string for yt-dlp. Should match the browser used to export cookies. Click "Use Current Browser" to auto-fill with your browser&apos;s user-agent.'
+                                />
+                                <FormInput
+                                    value={configForm.formData.user_agent || ''}
+                                    onChange={(e) => configForm.setValue('user_agent', e.target.value)}
+                                    placeholder='Leave empty to use yt-dlp default'
+                                    action={{
+                                        content: 'Use Current Browser',
+                                        onClick: () => configForm.setValue('user_agent', suggestedUserAgent),
+                                    }}
+                                />
+                            </Form.Field>
                         </Grid.Column>
                     </Grid.Row>
 
diff --git a/wrolpi/common.py b/wrolpi/common.py
index ec920b54..f48eeefc 100644
--- a/wrolpi/common.py
+++ b/wrolpi/common.py
@@ -863,7 +863,7 @@ class WROLPiConfig(ConfigFile):
         archive_destination='archive/%(domain_tag)s/%(domain)s',
         download_on_startup=True,
         download_timeout=0,
-        download_wait=60,
+        download_wait=20,
         hotspot_device='wlan0',
         hotspot_on_startup=True,
         hotspot_password='wrolpi hotspot',
@@ -944,7 +944,7 @@ class WROLPiConfig(ConfigFile):
 
     @property
     def download_wait(self) -> int:
-        return self._config.get('download_wait', 60)
+        return self._config.get('download_wait', 20)
 
     @download_wait.setter
     def download_wait(self, value: int):