diff --git a/package-lock.json b/package-lock.json
index 5ff415fa3..30b2934f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "covidcg",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e973deae7..37d09bf41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "covidcg",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "",
   "engines": {
     "node": ">=8",
diff --git a/src/components/GroupReport/GroupStructuralViewer.js b/src/components/GroupReport/GroupStructuralViewer.js
index 6b648ad79..e37e7c3aa 100644
--- a/src/components/GroupReport/GroupStructuralViewer.js
+++ b/src/components/GroupReport/GroupStructuralViewer.js
@@ -8,6 +8,7 @@ import { colorHeatmap, getMoleculeAssemblies } from '../LiteMol/litemolutils';
 import { reds } from '../../constants/colors';
 import { hexToRgb } from '../../utils/color';
 import { getAllProteins } from '../../utils/gene_protein';
+import defaultStructures from '../../../static_data/default_structures.json';
 
 import EmptyPlot from '../Common/EmptyPlot';
 import DownloadPymolScriptModal from '../Modals/DownloadPymolScriptModal';
@@ -64,11 +65,24 @@ const StructuralViewer = observer(() => {
   };
   const onChangeReportStructureActiveProtein = (event) => {
     const newProtein = event.target.value;
+
+    if (newProtein === state.activeProtein) {
+      return;
+    }
+
     setState({
       ...state,
       activeProtein: newProtein,
       activeProteinChanged:
         newProtein != plotSettingsStore.reportStructureActiveProtein,
+      // Clear PDB ID when protein changes
+      pdbId: Object.keys(defaultStructures).includes(newProtein)
+        ? defaultStructures[newProtein]
+        : '',
+      validPdbId: Object.keys(defaultStructures).includes(newProtein)
+        ? true
+        : false,
+      pdbIdChanged: true,
     });
   };
   const onChangePdbId = (event) => {
@@ -300,17 +314,6 @@ const StructuralViewer = observer(() => {
         <ConfirmButton onClick={downloadData}>Download Data</ConfirmButton>
       </StructuralViewerHeader>
       <StructuralViewerHeader>
-        <OptionSelectContainer>
-          <label>
-            Protein
-            <select
-              value={state.activeProtein}
-              onChange={onChangeReportStructureActiveProtein}
-            >
-              {proteinOptionItems}
-            </select>
-          </label>
-        </OptionSelectContainer>
         <OptionInputContainer>
           <label>
             PDB ID
@@ -319,10 +322,21 @@ const StructuralViewer = observer(() => {
           {!state.validPdbId && <InvalidText>Invalid PDB ID</InvalidText>}
           {(state.pdbIdChanged || state.activeProteinChanged) && (
             <ConfirmButton disabled={!state.validPdbId} onClick={applyChanges}>
-              Apply Changes
+              Apply
             </ConfirmButton>
           )}
         </OptionInputContainer>
+        <OptionSelectContainer>
+          <label>
+            Protein
+            <select
+              value={state.activeProtein}
+              onChange={onChangeReportStructureActiveProtein}
+            >
+              {proteinOptionItems}
+            </select>
+          </label>
+        </OptionSelectContainer>
         <div className="spacer"></div>
         <ConfirmButton onClick={showDownloadPymolScriptModal}>
           Download PyMOL Script
diff --git a/src/components/Pages/GroupReportTab.js b/src/components/Pages/GroupReportTab.js
index 8df894677..7e99548db 100644
--- a/src/components/Pages/GroupReportTab.js
+++ b/src/components/Pages/GroupReportTab.js
@@ -100,6 +100,12 @@ const GroupReportTab = observer(() => {
               compatibility, so it is possible to, for example, erroneously map
               nsp12 SNVs onto a Spike structure.
             </li>
+            <li>
+              More structures available at the{' '}
+              <ExternalLink href="https://www.rcsb.org/news?year=2020&article=5e74d55d2d410731e9944f52&feature=true">
+                RCSB COVID-19 resource page
+              </ExternalLink>
+            </li>
           </ul>
         }
       >
diff --git a/src/components/Vega/SurveillancePlot.js b/src/components/Vega/SurveillancePlot.js
index e3b7d7031..ebf3282ae 100644
--- a/src/components/Vega/SurveillancePlot.js
+++ b/src/components/Vega/SurveillancePlot.js
@@ -36,6 +36,7 @@ import {
   LegendItemContainer,
   LegendItemName,
   LegendItemCounts,
+  CollapseButton,
 } from './SurveillancePlot.styles';
 
 const maxCharsPerLine = 10;
@@ -198,8 +199,16 @@ const SurveillancePlot = observer(({ width }) => {
     },
     signalListeners: {},
     legendItems: [],
+    showSettings: false,
   });
 
+  const onToggleShowSettings = () => {
+    setState({
+      ...state,
+      showSettings: !state.showSettings,
+    });
+  };
+
   const onDismissWarning = () => {
     setState({
       ...state,
@@ -349,127 +358,140 @@ const SurveillancePlot = observer(({ width }) => {
                 </select>
               </label>
             </OptionSelectContainer>{' '}
-            Sort by{' '}
-            <OptionSelectContainer>
-              <label>
-                <select
-                  value={plotSettingsStore.surveillanceSortField}
-                  onChange={onChangeSortField}
-                >
-                  <option value={'group'}>Name</option>
-                  <option value={'counts'}>Counts</option>
-                </select>
-              </label>
-            </OptionSelectContainer>
-            <OptionSelectContainer>
-              <label>
-                <select
-                  value={plotSettingsStore.surveillanceSortDirection}
-                  onChange={onChangeSortDirection}
-                >
-                  <option value={SORT_DIRECTIONS.SORT_ASC}>Ascending</option>
-                  <option value={SORT_DIRECTIONS.SORT_DESC}>Descending</option>
-                </select>
-              </label>
-            </OptionSelectContainer>
-          </OptionsRow>
-          <OptionsRow>
-            <span>Displayed {groupName}</span>
-            <QuestionButton
-              data-tip={`<p>To improve readability, ${groupName} which do not meet these conditions in any of the six continents are removed from the plots. For example, if one ${groupName} fails these conditions in 5 continents but passes in the last one, it will still be shown. If one ${groupName} fails these conditions in all 6 continents, it will be excluded.</p><p>Min Counts is defined as the minimum number of sequences with this ${groupName} in a given continent on a given week</p><p>Min Percent is defined as the minimum percent of sequences with this ${groupName} in a given continent on a given week</p>`}
-              data-html="true"
-              data-place="right"
-              data-for="main-tooltip"
-              style={{ marginRight: 8 }}
+            <CollapseButton onClick={onToggleShowSettings}>
+              {state.showSettings ? 'Hide' : 'Show'} Settings{' '}
+              <span className="caret"></span>
+            </CollapseButton>
+            <div className="spacer"></div>
+            <DropdownButton
+              text={'Download'}
+              options={[
+                PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_DATA,
+                PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_PNG,
+                PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_PNG_2X,
+                PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_PNG_4X,
+                PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_SVG,
+              ]}
+              onSelect={handleDownloadSelect}
             />
-            <OptionInputContainer>
-              <label>
-                Min Counts
-                <input
-                  type="number"
-                  value={plotSettingsStore.surveillanceDisplayMinCounts}
-                  onChange={onChangeDisplayMinCounts}
-                  min={0}
-                  step={1}
-                />
-              </label>
-            </OptionInputContainer>
-            <OptionInputContainer>
-              <label>
-                Min Percent
-                <input
-                  type="number"
-                  value={plotSettingsStore.surveillanceDisplayMinPercent}
-                  onChange={onChangeDisplayMinPercent}
-                  min={0}
-                  max={1}
-                  step={0.01}
-                />
-              </label>
-            </OptionInputContainer>
           </OptionsRow>
-          <OptionsRow>
-            <span>Highlighted {groupName}</span>
-            <QuestionButton
-              data-tip={`<p>Choose ${groupName} to highlight and display in the legend. ${groupName} which pass these conditions in at least one of six continents will be highlighted. Non-highlighted ${groupName} are still displayed but not colored.</p><p>Min Counts is defined as the minimum number of sequences with this ${groupName} in a given continent on a given week</p><p>Min Percent is defined as the minimum percent of sequences with this ${groupName} in a given continent on a given week</p><p>Min Correlation is defined as the minimum Pearson correlation of the % sequences of this ${groupName}. For the correlation calculations, the last ${config.surv_end_date_days_ago} days from today are omitted, to reduce noise in this metric.</p>`}
-              data-html="true"
-              data-place="right"
-              data-for="main-tooltip"
-              style={{ marginRight: 8 }}
-            />
-            <OptionInputContainer>
-              <label>
-                Min Counts
-                <input
-                  type="number"
-                  value={plotSettingsStore.surveillanceSigMinCounts}
-                  onChange={onChangeSigMinCounts}
-                  min={0}
-                  step={1}
+          {state.showSettings && (
+            <>
+              <OptionsRow>
+                Sort by{' '}
+                <OptionSelectContainer>
+                  <label>
+                    <select
+                      value={plotSettingsStore.surveillanceSortField}
+                      onChange={onChangeSortField}
+                    >
+                      <option value={'group'}>Name</option>
+                      <option value={'counts'}>Counts</option>
+                    </select>
+                  </label>
+                </OptionSelectContainer>
+                <OptionSelectContainer>
+                  <label>
+                    <select
+                      value={plotSettingsStore.surveillanceSortDirection}
+                      onChange={onChangeSortDirection}
+                    >
+                      <option value={SORT_DIRECTIONS.SORT_ASC}>
+                        Ascending
+                      </option>
+                      <option value={SORT_DIRECTIONS.SORT_DESC}>
+                        Descending
+                      </option>
+                    </select>
+                  </label>
+                </OptionSelectContainer>
+              </OptionsRow>
+              <OptionsRow>
+                <span>Displayed {groupName}</span>
+                <QuestionButton
+                  data-tip={`<p>To improve readability, ${groupName} which do not meet these conditions in any of the six continents are removed from the plots. For example, if one ${groupName} fails these conditions in 5 continents but passes in the last one, it will still be shown. If one ${groupName} fails these conditions in all 6 continents, it will be excluded.</p><p>Min Counts is defined as the minimum number of sequences with this ${groupName} in a given continent on a given week</p><p>Min Percent is defined as the minimum percent of sequences with this ${groupName} in a given continent on a given week</p>`}
+                  data-html="true"
+                  data-place="right"
+                  data-for="main-tooltip"
+                  style={{ marginRight: 8 }}
                 />
-              </label>
-            </OptionInputContainer>
-            <OptionInputContainer>
-              <label>
-                Min Percent
-                <input
-                  type="number"
-                  value={plotSettingsStore.surveillanceSigMinPercent}
-                  onChange={onChangeSigMinPercent}
-                  min={0}
-                  max={1}
-                  step={0.01}
-                />
-              </label>
-            </OptionInputContainer>
-            <OptionInputContainer>
-              <label>
-                Min Correlation
-                <input
-                  type="number"
-                  value={plotSettingsStore.surveillanceSigMinR}
-                  onChange={onChangeSigMinR}
-                  min={-1}
-                  max={1}
-                  step={0.01}
+                <OptionInputContainer>
+                  <label>
+                    Min Counts
+                    <input
+                      type="number"
+                      value={plotSettingsStore.surveillanceDisplayMinCounts}
+                      onChange={onChangeDisplayMinCounts}
+                      min={0}
+                      step={1}
+                    />
+                  </label>
+                </OptionInputContainer>
+                <OptionInputContainer>
+                  <label>
+                    Min Percent
+                    <input
+                      type="number"
+                      value={plotSettingsStore.surveillanceDisplayMinPercent}
+                      onChange={onChangeDisplayMinPercent}
+                      min={0}
+                      max={1}
+                      step={0.01}
+                    />
+                  </label>
+                </OptionInputContainer>
+              </OptionsRow>
+              <OptionsRow>
+                <span>Highlighted {groupName}</span>
+                <QuestionButton
+                  data-tip={`<p>Choose ${groupName} to highlight and display in the legend. ${groupName} which pass these conditions in at least one of six continents will be highlighted. Non-highlighted ${groupName} are still displayed but not colored.</p><p>Min Counts is defined as the minimum number of sequences with this ${groupName} in a given continent on a given week</p><p>Min Percent is defined as the minimum percent of sequences with this ${groupName} in a given continent on a given week</p><p>Min Correlation is defined as the minimum Pearson correlation of the % sequences of this ${groupName}. For the correlation calculations, the last ${config.surv_end_date_days_ago} days from today are omitted, to reduce noise in this metric.</p>`}
+                  data-html="true"
+                  data-place="right"
+                  data-for="main-tooltip"
+                  style={{ marginRight: 8 }}
                 />
-              </label>
-            </OptionInputContainer>
-          </OptionsRow>
+                <OptionInputContainer>
+                  <label>
+                    Min Counts
+                    <input
+                      type="number"
+                      value={plotSettingsStore.surveillanceSigMinCounts}
+                      onChange={onChangeSigMinCounts}
+                      min={0}
+                      step={1}
+                    />
+                  </label>
+                </OptionInputContainer>
+                <OptionInputContainer>
+                  <label>
+                    Min Percent
+                    <input
+                      type="number"
+                      value={plotSettingsStore.surveillanceSigMinPercent}
+                      onChange={onChangeSigMinPercent}
+                      min={0}
+                      max={1}
+                      step={0.01}
+                    />
+                  </label>
+                </OptionInputContainer>
+                <OptionInputContainer>
+                  <label>
+                    Min Correlation
+                    <input
+                      type="number"
+                      value={plotSettingsStore.surveillanceSigMinR}
+                      onChange={onChangeSigMinR}
+                      min={-1}
+                      max={1}
+                      step={0.01}
+                    />
+                  </label>
+                </OptionInputContainer>
+              </OptionsRow>
+            </>
+          )}
         </OptionsColumn>
-
-        <div className="spacer"></div>
-        <DropdownButton
-          text={'Download'}
-          options={[
-            PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_DATA,
-            PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_PNG,
-            PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_PNG_2X,
-            PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_PNG_4X,
-            PLOT_DOWNLOAD_OPTIONS.DOWNLOAD_SVG,
-          ]}
-          onSelect={handleDownloadSelect}
-        />
       </PlotOptions>
       <PlotAndLegend>
         <SurveillanceLegend
diff --git a/src/components/Vega/SurveillancePlot.styles.js b/src/components/Vega/SurveillancePlot.styles.js
index f2b1c1da2..05e32c18f 100644
--- a/src/components/Vega/SurveillancePlot.styles.js
+++ b/src/components/Vega/SurveillancePlot.styles.js
@@ -1,6 +1,8 @@
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 
+import Button from '../Buttons/Button';
+
 export const PlotContainer = styled.div`
   overflow-x: hidden;
 `;
@@ -38,12 +40,17 @@ export const HelpText = styled.p`
 export const OptionsColumn = styled.div`
   display: flex;
   flex-direction: column;
+  width: 100%;
 `;
 
 export const OptionsRow = styled.div`
   display: flex;
   flex-direction: row;
   margin-top: 5px;
+
+  .spacer {
+    flex-grow: 1;
+  }
 `;
 
 export const PlotAndLegend = styled.div`
@@ -102,3 +109,30 @@ export const LegendItemCounts = styled.div`
   padding-left: 3px;
   border-left: 1px solid #eee;
 `;
+
+export const CollapseButton = styled(Button)`
+  background-color: #f8f8f8;
+  background-image: none;
+  color: #444;
+  padding-right: 20px;
+
+  &:hover,
+  &:active {
+    background-color: #eee;
+  }
+
+  .caret {
+    position: relative;
+    margin-left: 5px;
+  }
+
+  .caret:after {
+    content: '';
+    position: absolute;
+    left: 1px;
+    top: 5px;
+    border-top: 5px solid #444;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+  }
+`;
diff --git a/src/stores/plotSettingsStore.js b/src/stores/plotSettingsStore.js
index 625c4712f..092ad0c4c 100644
--- a/src/stores/plotSettingsStore.js
+++ b/src/stores/plotSettingsStore.js
@@ -25,13 +25,13 @@ export const initialValues = {
 
   // SURVEILLANCE PLOT
   surveillanceMode: 'lineage',
-  surveillanceSortField: 'group',
-  surveillanceSortDirection: SORT_DIRECTIONS.SORT_ASC,
+  surveillanceSortField: 'counts', // 'group' or 'counts'
+  surveillanceSortDirection: SORT_DIRECTIONS.SORT_DESC,
   surveillanceDisplayMinCounts: 5,
   surveillanceDisplayMinPercent: 0.01,
   surveillanceSigMinCounts: 10,
-  surveillanceSigMinPercent: 0.05,
-  surveillanceSigMinR: 0.5,
+  surveillanceSigMinPercent: 0.02,
+  surveillanceSigMinR: 0.3,
   surveillanceLegendHover: [],
 
   // GROUP REPORT TAB
diff --git a/src/utils/version.js b/src/utils/version.js
index 4094db02f..7dc459ccf 100644
--- a/src/utils/version.js
+++ b/src/utils/version.js
@@ -1 +1 @@
-export const version = '2.2.2';
+export const version = '2.2.3';
diff --git a/src/vega_specs/global_seq_v2.vg.json b/src/vega_specs/global_seq_v2.vg.json
index 0f8517177..bf3fa3324 100644
--- a/src/vega_specs/global_seq_v2.vg.json
+++ b/src/vega_specs/global_seq_v2.vg.json
@@ -284,7 +284,7 @@
       "value": {},
       "on": [
         {"events": "@point:mousedown", "update": "datum"},
-        {"events": "@seqMap:dblclick", "update": "datum"},
+        {"events": "@seqMap:mousedown", "update": "datum"},
         {"events": "window:mouseup", "update": "{}"}
       ]
     },
diff --git a/src/vega_specs/group_tree_v2.vg.json b/src/vega_specs/group_tree_v2.vg.json
index a171d19f8..8ea0b6144 100644
--- a/src/vega_specs/group_tree_v2.vg.json
+++ b/src/vega_specs/group_tree_v2.vg.json
@@ -9,7 +9,7 @@
   "data": [
     {
       "name": "source",
-      "url": "https://storage.googleapis.com/ve-public/lineage_tree_graph_v2.json",
+      "url": "https://storage.googleapis.com/ve-public/lineage_tree_graph.json",
       "format": {
         "parse": {
           "date": "date",
diff --git a/static_data/default_structures.json b/static_data/default_structures.json
new file mode 100644
index 000000000..7218b39a2
--- /dev/null
+++ b/static_data/default_structures.json
@@ -0,0 +1,3 @@
+{
+    "S": "6ZGG"
+}
\ No newline at end of file