diff --git a/js/photons/view/LaserNode.ts b/js/photons/view/LaserNode.ts
index 43bc310..ff19aca 100644
--- a/js/photons/view/LaserNode.ts
+++ b/js/photons/view/LaserNode.ts
@@ -57,7 +57,8 @@ export default class LaserNode extends Node {
       },
       right: modelViewTransform.modelToViewX( model.position.x ),
       centerY: modelViewTransform.modelToViewY( model.position.y ),
-      tandem: providedOptions.tandem.createTandem( 'laserPointerNode' )
+      tandem: providedOptions.tandem.createTandem( 'laserPointerNode' ),
+      phetioVisiblePropertyInstrumented: false
     } );
     const caption = new Text( QuantumMeasurementStrings.photonSourceStringProperty, {
       font: new PhetFont( 12 ),
@@ -103,7 +104,8 @@ export default class LaserNode extends Node {
       nodeChildren.push( labelAlignBox );
     }
     const options = optionize<LaserNodeOptions, SelfOptions, NodeOptions>()( {
-      children: nodeChildren
+      children: nodeChildren,
+      phetioVisiblePropertyInstrumented: false
     }, providedOptions );
 
     super( options );
diff --git a/js/photons/view/MirrorNode.ts b/js/photons/view/MirrorNode.ts
index 36a26ce..9ed62d2 100644
--- a/js/photons/view/MirrorNode.ts
+++ b/js/photons/view/MirrorNode.ts
@@ -24,7 +24,7 @@ export default class MirrorNode extends Node {
 
   public constructor( model: Mirror,
                       modelViewTransform: ModelViewTransform2,
-                      providedOptions: MirrorNodeOptions ) {
+                      providedOptions?: MirrorNodeOptions ) {
 
     // Define an offset for positioning the mirror.  This is needed because the photons reflect based on their center
     // positions, and if the mirror isn't offset a bit, the photons can appear to go partially through the mirror.
diff --git a/js/photons/view/PhotonDetectorNode.ts b/js/photons/view/PhotonDetectorNode.ts
index b2cd8dd..f6647d0 100644
--- a/js/photons/view/PhotonDetectorNode.ts
+++ b/js/photons/view/PhotonDetectorNode.ts
@@ -39,7 +39,7 @@ export default class PhotonDetectorNode extends Node {
 
   public constructor( model: PhotonDetector,
                       modelViewTransform: ModelViewTransform2,
-                      providedOptions: PhotonDetectorNodeOptions ) {
+                      providedOptions?: PhotonDetectorNodeOptions ) {
 
     // Create the detection aperture.  This is essentially the anchor point for reset of the layout, meaning that the
     // other nodes are positioned relative to this.
@@ -141,7 +141,8 @@ export default class PhotonDetectorNode extends Node {
 
     const options = optionize<PhotonDetectorNodeOptions, SelfOptions, NodeOptions>()(
       {
-        children: [ aperture, bodyRectangle, countReadout, label ]
+        children: [ aperture, bodyRectangle, countReadout, label ],
+        phetioVisiblePropertyInstrumented: false
       },
       providedOptions
     );
diff --git a/js/photons/view/PhotonPolarizationAngleControl.ts b/js/photons/view/PhotonPolarizationAngleControl.ts
index 087680f..352306e 100644
--- a/js/photons/view/PhotonPolarizationAngleControl.ts
+++ b/js/photons/view/PhotonPolarizationAngleControl.ts
@@ -42,7 +42,9 @@ export default class PhotonPolarizationAngleControl extends Panel {
     const options = optionize<PhotonPolarizationAngleControlOptions, SelfOptions, PanelOptions>()( {
       fill: QuantumMeasurementColors.controlPanelFillColorProperty,
       stroke: QuantumMeasurementColors.controlPanelStrokeColorProperty,
-      cornerRadius: 5
+      cornerRadius: 5,
+      xMargin: 10,
+      yMargin: 10
     }, providedOptions );
 
     const titleProperty = new Text( QuantumMeasurementStrings.photonPolarizationAngleStringProperty, {
diff --git a/js/photons/view/PhotonTestingArea.ts b/js/photons/view/PhotonTestingArea.ts
index 3ee5dc5..756654c 100644
--- a/js/photons/view/PhotonTestingArea.ts
+++ b/js/photons/view/PhotonTestingArea.ts
@@ -82,30 +82,19 @@ class PhotonTestingArea extends Node {
 
     const verticalPolarizationDetector = new PhotonDetectorNode(
       model.verticalPolarizationDetector,
-      photonTestingAreaModelViewTransform,
-      {
-        tandem: providedOptions.tandem.createTandem( 'verticalPolarizationDetector' )
-      }
+      photonTestingAreaModelViewTransform
     );
     const horizontalPolarizationDetector = new PhotonDetectorNode(
       model.horizontalPolarizationDetector,
-      photonTestingAreaModelViewTransform,
-      {
-        tandem: providedOptions.tandem.createTandem( 'horizontalPolarizationDetector' )
-      }
+      photonTestingAreaModelViewTransform
     );
 
     const polarizingBeamSplitterNode = new PolarizingBeamSplitterNode(
       model.polarizingBeamSplitter,
-      photonTestingAreaModelViewTransform,
-      {
-        tandem: providedOptions.tandem.createTandem( 'polarizingBeamSplitterNode' )
-      }
+      photonTestingAreaModelViewTransform
     );
 
-    const mirror = new MirrorNode( model.mirror, photonTestingAreaModelViewTransform, {
-      tandem: providedOptions.tandem.createTandem( 'mirror' )
-    } );
+    const mirror = new MirrorNode( model.mirror, photonTestingAreaModelViewTransform );
 
     const options = optionize<PhotonTestingAreaOptions, SelfOptions, NodeOptions>()( {
       children: [
diff --git a/js/photons/view/PhotonsExperimentSceneView.ts b/js/photons/view/PhotonsExperimentSceneView.ts
index 375ffc3..f6b478b 100644
--- a/js/photons/view/PhotonsExperimentSceneView.ts
+++ b/js/photons/view/PhotonsExperimentSceneView.ts
@@ -90,8 +90,7 @@ class PhotonsExperimentSceneView extends Node {
         cornerRadius: 5,
         xMargin: 20,
         yMargin: 10,
-        align: 'center',
-        tandem: providedOptions.tandem.createTandem( 'averagePolarizationTitlePanel' )
+        align: 'center'
       }
     );
 
diff --git a/js/photons/view/PolarizingBeamSplitterNode.ts b/js/photons/view/PolarizingBeamSplitterNode.ts
index 775fe94..6fba403 100644
--- a/js/photons/view/PolarizingBeamSplitterNode.ts
+++ b/js/photons/view/PolarizingBeamSplitterNode.ts
@@ -24,7 +24,7 @@ export default class PolarizingBeamSplitterNode extends Node {
 
   public constructor( model: PolarizingBeamSplitter,
                       modelViewTransform: ModelViewTransform2,
-                      providedOptions: PolarizingBeamSplitterNodeOptions ) {
+                      providedOptions?: PolarizingBeamSplitterNodeOptions ) {
 
     const nodeSize = new Dimension2(
       modelViewTransform.modelToViewDeltaX( model.size.width ),