diff --git a/Source/NeuropixEditor.cpp b/Source/NeuropixEditor.cpp
index f110dbc..64574f7 100644
--- a/Source/NeuropixEditor.cpp
+++ b/Source/NeuropixEditor.cpp
@@ -625,7 +625,7 @@ NeuropixEditor::NeuropixEditor (GenericProcessor* parentNode, NeuropixThread* t)
         if (thread->type != ONEBOX)
         {
             mainSyncSelector->setVisible (true);
-            //addSyncChannelButton->setVisible (true);
+            addSyncChannelButton->setVisible (true);
             refreshButton->setVisible (true);
         }
 
@@ -634,6 +634,8 @@ NeuropixEditor::NeuropixEditor (GenericProcessor* parentNode, NeuropixThread* t)
     }
     else
     {
+        syncFrequencyLabel->setVisible (false);
+        addSyncChannelButton->setVisible (false);
         desiredWidth = 250;
     }
 
@@ -777,7 +779,8 @@ void NeuropixEditor::comboBoxChanged (ComboBox* comboBox)
         if (asOutput)
         {
             thread->setSyncOutput (slotIndex);
-            syncFrequencyLabel->setVisible (true);
+            if (background->numBasestations > 0)
+                syncFrequencyLabel->setVisible (true);
             background->setFreqSelectAvailable (true);
         }
         else
@@ -1051,7 +1054,9 @@ void NeuropixEditor::loadVisualizerEditorParameters (XmlElement* xml)
             {
                 inputOutputSyncSelector->setSelectedItemIndex (1, dontSendNotification);
                 thread->setSyncOutput (mainSyncSlotIndex);
-                syncFrequencyLabel->setVisible (true);
+
+                if(background->numBasestations > 0)
+                    syncFrequencyLabel->setVisible (true);
                 background->setFreqSelectAvailable (true);
                 // syncFrequencySelector->setSelectedItemIndex (frequencyIndex, dontSendNotification);
                 thread->setSyncFrequency (mainSyncSlotIndex, frequencyIndex);
diff --git a/Source/NeuropixEditor.h b/Source/NeuropixEditor.h
index 7dd61b9..ba09db1 100644
--- a/Source/NeuropixEditor.h
+++ b/Source/NeuropixEditor.h
@@ -120,11 +120,12 @@ class EditorBackground : public Component, public ComponentListener
             slotButtons[i]->isEnabled = isEnabled;
     }
 
+    int numBasestations;
+
 private:
     /** Draws the background */
     void paint (Graphics& g);
 
-    int numBasestations;
     bool freqSelectEnabled;
 
     /* An array of Basestation objections, one for each basestation detected */
diff --git a/Source/NeuropixThread.cpp b/Source/NeuropixThread.cpp
index be7ded2..38a07bf 100644
--- a/Source/NeuropixThread.cpp
+++ b/Source/NeuropixThread.cpp
@@ -475,8 +475,6 @@ NeuropixThread::~NeuropixThread()
 
      LOGD ("NeuropixThread destructor.");
 
-     editor->uiLoader->waitForThreadToExit (-1);
-
     closeConnection();
 }