diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index edc4b4d78..b05a551cd 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -295,8 +295,8 @@ wxCheckBox * ShuttleGuiBase::AddCheckBox( const wxString &Prompt, const wxString
    wxString realPrompt = Prompt;
    if( mpbOptionalFlag )
    {
-      AddPrompt( Prompt);
-      realPrompt = wxT("");
+      AddPrompt( "");
+      //realPrompt = wxT("");
    }
 
    UseUpId();
diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp
index 6d331656b..a93ea17c7 100644
--- a/src/commands/SelectCommand.cpp
+++ b/src/commands/SelectCommand.cpp
@@ -69,8 +69,9 @@ void SelectTimeCommand::PopulateOrExchange(ShuttleGui & S)
    auto relativeSpec = LocalizedStrings( kRelativeTo, nRelativeTos );
    S.AddSpace(0, 5);
 
-   S.StartMultiColumn(3, wxALIGN_CENTER);
+   S.StartMultiColumn(3, wxEXPAND);
    {
+      S.SetStretchyCol( 2 );
       S.Optional( bHasT0 ).TieTextBox(_("Start Time:"), mT0);
       S.Optional( bHasT1 ).TieTextBox(_("End Time:"),   mT1);
       // Chooses what time is relative to.
@@ -134,8 +135,9 @@ void SelectFrequenciesCommand::PopulateOrExchange(ShuttleGui & S)
 {
    S.AddSpace(0, 5);
 
-   S.StartMultiColumn(3, wxALIGN_CENTER);
+   S.StartMultiColumn(3, wxEXPAND);
    {
+      S.SetStretchyCol( 2 );
       S.Optional( bHasTop    ).TieTextBox(_("High:"), mTop);
       S.Optional( bHasBottom ).TieTextBox(_("Low:"),  mBottom);
    }
@@ -174,8 +176,9 @@ void SelectTracksCommand::PopulateOrExchange(ShuttleGui & S)
    auto modes = LocalizedStrings( kModes, nModes );
    S.AddSpace(0, 5);
 
-   S.StartMultiColumn(3, wxALIGN_CENTER);
+   S.StartMultiColumn(3, wxEXPAND);
    {
+      S.SetStretchyCol( 2 );
       S.Optional( bHasFirstTrack).TieTextBox(_("First Track:"),mFirstTrack);
       S.Optional( bHasLastTrack).TieTextBox(_("Last Track:"),mLastTrack);
    }
diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp
index 890cb983d..060c8701a 100644
--- a/src/commands/SetTrackInfoCommand.cpp
+++ b/src/commands/SetTrackInfoCommand.cpp
@@ -60,8 +60,9 @@ void SetTrackBase::PopulateOrExchange(ShuttleGui & S)
    if( !mbPromptForTracks )
       return;
    S.AddSpace(0, 5);
-   S.StartMultiColumn(3, wxALIGN_CENTER);
+   S.StartMultiColumn(3, wxEXPAND);
    {
+      S.SetStretchyCol( 2 );
       S.Optional( bHasTrackIndex  ).TieNumericTextBox(  _("Track Index:"),   mTrackIndex );
       S.Optional( bHasChannelIndex).TieNumericTextBox(  _("Channel Index:"), mChannelIndex );
    }
@@ -108,15 +109,17 @@ bool SetTrackStatusCommand::DefineParams( ShuttleParams & S ){
 void SetTrackStatusCommand::PopulateOrExchange(ShuttleGui & S)
 {
    SetTrackBase::PopulateOrExchange( S );
-   S.StartMultiColumn(3, wxALIGN_CENTER);
+   S.StartMultiColumn(3, wxEXPAND);
    {
+      S.SetStretchyCol( 2 );
       S.Optional( bHasTrackName   ).TieTextBox(         _("Name:"),          mTrackName );
-//   }
-//   S.EndMultiColumn();
-//   S.StartMultiColumn(3, wxALIGN_CENTER);
-//   {
-      S.Optional( bHasSelected       ).TieCheckBox( _("Selected:"),           bSelected );
-      S.Optional( bHasFocused        ).TieCheckBox( _("Focused:"),            bFocused);
+   }
+   S.EndMultiColumn();
+   S.StartMultiColumn(2, wxEXPAND);
+   {
+      S.SetStretchyCol( 1 );
+      S.Optional( bHasSelected       ).TieCheckBox( _("Selected"),           bSelected );
+      S.Optional( bHasFocused        ).TieCheckBox( _("Focused"),            bFocused);
    }
    S.EndMultiColumn();
 }
@@ -153,28 +156,29 @@ bool SetTrackStatusCommand::ApplyInner(const CommandContext & context, Track * t
 
 bool SetTrackAudioCommand::DefineParams( ShuttleParams & S ){ 
    SetTrackBase::DefineParams( S );
+   S.OptionalN( bHasMute           ).Define(     bMute,           wxT("Mute"),       false );
+   S.OptionalN( bHasSolo           ).Define(     bSolo,           wxT("Solo"),       false );
+
    S.OptionalN( bHasPan            ).Define(     mPan,            wxT("Pan"),        0.0, -1.0, 1.0);
    S.OptionalN( bHasGain           ).Define(     mGain,           wxT("Gain"),       1.0,  0.0, 10.0);
-
-   // There is also a select command.  This is an alternative.
-   S.OptionalN( bHasSolo           ).Define(     bSolo,           wxT("Solo"),       false );
-   S.OptionalN( bHasMute           ).Define(     bMute,           wxT("Mute"),       false );
    return true;
 };
 
 void SetTrackAudioCommand::PopulateOrExchange(ShuttleGui & S)
 {
    SetTrackBase::PopulateOrExchange( S );
-   S.StartMultiColumn(3, wxALIGN_CENTER);
+   S.StartMultiColumn(2, wxEXPAND);
    {
+      S.SetStretchyCol( 1 );
+      S.Optional( bHasMute           ).TieCheckBox( _("Mute"),               bMute);
+      S.Optional( bHasSolo           ).TieCheckBox( _("Solo"),               bSolo);
+   }
+   S.EndMultiColumn();
+   S.StartMultiColumn(3, wxEXPAND);
+   {
+      S.SetStretchyCol( 2 );
       S.Optional( bHasPan         ).TieSlider(          _("Pan:"),           mPan,  1.0, -1.0);
       S.Optional( bHasGain        ).TieSlider(          _("Gain:"),          mGain, 10.0, 0.0);
-//   }
-//   S.EndMultiColumn();
-//   S.StartMultiColumn(3, wxALIGN_CENTER);
-//   {
-      S.Optional( bHasSolo           ).TieCheckBox( _("Solo:"),               bSolo);
-      S.Optional( bHasMute           ).TieCheckBox( _("Mute:"),               bMute);
    }
    S.EndMultiColumn();
 }
@@ -290,17 +294,22 @@ void SetTrackVisualsCommand::PopulateOrExchange(ShuttleGui & S)
    auto vzooms = LocalizedStrings( kZoomTypeStrings, nZoomTypes );
 
    SetTrackBase::PopulateOrExchange( S );
-   S.StartMultiColumn(3, wxALIGN_CENTER);
+   S.StartMultiColumn(3, wxEXPAND);
    {
+      S.SetStretchyCol( 2 );
       S.Optional( bHasHeight      ).TieNumericTextBox(  _("Height:"),        mHeight );
       S.Optional( bHasColour      ).TieChoice(          _("Colour:"),        mColour,      &colours );
       S.Optional( bHasDisplayType ).TieChoice(          _("Display:"),       mDisplayType, &displays );
       S.Optional( bHasScaleType   ).TieChoice(          _("Scale:"),         mScaleType,   &scales );
       S.Optional( bHasVZoom       ).TieChoice(          _("VZoom:"),         mVZoom,       &vzooms );
-
-      S.Optional( bHasUseSpecPrefs   ).TieCheckBox( _("Use Spectral Prefs:"), bUseSpecPrefs );
-      S.Optional( bHasSpectralSelect ).TieCheckBox( _("Spectral Select:"),    bSpectralSelect);
-      S.Optional( bHasGrayScale      ).TieCheckBox( _("Gray Scale:"),         bGrayScale );
+   }
+   S.EndMultiColumn();
+   S.StartMultiColumn(2, wxEXPAND);
+   {
+      S.SetStretchyCol( 1 );
+      S.Optional( bHasUseSpecPrefs   ).TieCheckBox( _("Use Spectral Prefs"), bUseSpecPrefs );
+      S.Optional( bHasSpectralSelect ).TieCheckBox( _("Spectral Select"),    bSpectralSelect);
+      S.Optional( bHasGrayScale      ).TieCheckBox( _("Gray Scale"),         bGrayScale );
    }
    S.EndMultiColumn();
 }