diff --git a/src/apps/rednatco/controls.tsx b/src/apps/rednatco/controls.tsx
index d625c8cf67462cac105b06823058bf5867284410..f2f8977c3de0010f184ee27ae9a228c70bf0ecb8 100644
--- a/src/apps/rednatco/controls.tsx
+++ b/src/apps/rednatco/controls.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { stof } from './util';
+import { numDecimals, stof } from './util';
 
 const Zero = '0'.charCodeAt(0);
 const Nine = '9'.charCodeAt(0);
@@ -142,6 +142,9 @@ export class SpinBox extends React.Component<SpinBox.Props, SpinBoxState> {
     }
 
     private handleChange(value: string) {
+        if (this.props.maxNumDecimals !== undefined && numDecimals(value) > this.props.maxNumDecimals)
+            return;
+
         const n = stof(value);
 
         if (
@@ -224,5 +227,6 @@ export namespace SpinBox {
         className?: string;
         classNameDisabled?: string;
         formatter?: Formatter;
+        maxNumDecimals?: number;
     }
 }
diff --git a/src/apps/rednatco/density-map-controls.tsx b/src/apps/rednatco/density-map-controls.tsx
index 293e719c196667cd6607041627f39e7d8ff83ced..ef6a10ba8eeb794abd2f5bd124427e2d9652ae96 100644
--- a/src/apps/rednatco/density-map-controls.tsx
+++ b/src/apps/rednatco/density-map-controls.tsx
@@ -48,6 +48,7 @@ export class DensityMapControls extends React.Component<DensityMapControls.Props
                                     min={this.props.isoMin}
                                     max={this.props.isoMax}
                                     step={this.props.isoStep}
+                                    maxNumDecimals={Math.log10(this.props.isoStep) >= 0 ? 0 : -Math.log10(this.props.isoStep)}
                                     value={isoToFixed(this.props.iso, this.props.isoStep)}
                                     onChange={(n) => this.props.changeIso(n)}
                                     pathPrefix=''
@@ -76,6 +77,7 @@ export class DensityMapControls extends React.Component<DensityMapControls.Props
                                     min={0}
                                     max={1}
                                     step={0.1}
+                                    maxNumDecimals={1}
                                     value={(1.0 - this.props.alpha)}
                                     onChange={(n) => this.props.changeAlpha(1.0 - n)}
                                     pathPrefix=''
diff --git a/src/apps/rednatco/index.tsx b/src/apps/rednatco/index.tsx
index 68a2625cf759d7a7481f3834ae999d2406f87af8..65e8e3a626f25933f2be6d3bcdb8fb71dde35dd9 100644
--- a/src/apps/rednatco/index.tsx
+++ b/src/apps/rednatco/index.tsx
@@ -368,13 +368,8 @@ export class ReDNATCOMsp extends React.Component<ReDNATCOMsp.Props, State> {
                                         enabled={ready}
                                         switchedOn={this.state.display.structures.showPyramids}
                                         onClick={() => {
-                                            const display: Display = {
-                                                ...this.state.display,
-                                                structures: {
-                                                    ...this.state.display.structures,
-                                                    showPyramids: !this.state.display.structures.showPyramids,
-                                                }
-                                            };
+                                            const display = { ...this.state.display };
+                                            display.structures.showPyramids = !display.structures.showPyramids;
                                             this.viewer!.changePyramids(display);
                                             this.setState({ ...this.state, display });
                                         }}
@@ -385,13 +380,8 @@ export class ReDNATCOMsp extends React.Component<ReDNATCOMsp.Props, State> {
                                         text={this.state.display.structures.pyramidsTransparent ? 'Transparent' : 'Solid'}
                                         enabled={this.state.display.structures.showPyramids}
                                         onClick={() => {
-                                            const display: Display = {
-                                                ...this.state.display,
-                                                structures: {
-                                                    ...this.state.display.structures,
-                                                    pyramidsTransparent: !this.state.display.structures.pyramidsTransparent,
-                                                }
-                                            };
+                                            const display = { ...this.state.display };
+                                            display.structures.pyramidsTransparent = !display.structures.pyramidsTransparent;
                                             this.viewer!.changePyramids(display);
                                             this.setState({ ...this.state, display });
                                         }}
@@ -412,13 +402,9 @@ export class ReDNATCOMsp extends React.Component<ReDNATCOMsp.Props, State> {
                                         text={this.state.display.structures.ballsTransparent ? 'Transparent' : 'Solid'}
                                         enabled={this.state.display.structures.showBalls}
                                         onClick={() => {
-                                            const display: Display = {
-                                                ...this.state.display,
-                                                structures: {
-                                                    ...this.state.display.structures,
-                                                    ballsTransparent: !this.state.display.structures.ballsTransparent,
-                                                },
-                                            };
+                                            const display = { ...this.state.display };
+                                            display.structures.showBalls = !display.structures.showBalls;
+
                                             /* No balls today... */
                                             this.setState({ ...this.state, display });
                                         }}
diff --git a/src/apps/rednatco/viewer.ts b/src/apps/rednatco/viewer.ts
index 63514a690d29fb8961cb8605060fdbe24299f40e..aacf7a673e73650f3714bce1dc6b8f57325c09e2 100644
--- a/src/apps/rednatco/viewer.ts
+++ b/src/apps/rednatco/viewer.ts
@@ -847,7 +847,7 @@ export class ReDNATCOMspViewer {
     }
 
     isReady() {
-        return this.has('structure', '', BaseRef);
+        return this.has('entire-structure', '', BaseRef);
     }
 
     async loadStructure(
@@ -967,6 +967,9 @@ export class ReDNATCOMspViewer {
             const bounds = isoBounds(isoRange.min, isoRange.max);
             const iso = prettyIso(((isoRange.max - isoRange.min) / 2) + isoRange.min, bounds.step);
 
+            display.densityMap.representations = ['wireframe'];
+            display.densityMap.isoValue = iso;
+
             await this.plugin.state.data.build().to(IDs.DensityID('volume', BaseRef))
                 .apply(
                     StateTransforms.Representation.VolumeRepresentation3D,
@@ -974,9 +977,6 @@ export class ReDNATCOMspViewer {
                     { ref: IDs.DensityID('visual', BaseRef) }
                 )
                 .commit();
-
-            display.densityMap.representations = ['wireframe'];
-            display.densityMap.isoValue = iso;
         }
 
         this.haveMultipleModels = this.getModelCount() > 1;