diff --git a/src/DAQ/Digitizer.cpp b/src/DAQ/Digitizer.cpp
index b2ac3d1..0620a39 100644
--- a/src/DAQ/Digitizer.cpp
+++ b/src/DAQ/Digitizer.cpp
@@ -502,7 +502,10 @@ namespace Daqromancy {
             m_caenParams.trgc[i] = (CAEN_DGTZ_DPP_TriggerConfig_t)1; // Deprecated, must be set to one according to docs
         }
         //These are like global digitizer params but PSD specific. Here we treat first channel as "global" setting (similar to CoMPASS)
-        
+        m_caenParams.blthr = m_channelParams[0].baselineThreshold;
+        m_caenParams.trgho = m_channelParams[0].triggerHoldOff;
+        m_caenParams.purh = m_channelParams[0].pileUpRejection;
+        m_caenParams.purgap = m_channelParams[0].purgap;
 
         /*
             Something not immediately clear... there is no GetDPPParameters function
@@ -533,7 +536,6 @@ namespace Daqromancy {
             m_channelParams[i].cfdDelay = m_caenParams.cfdd[i] * m_samplingTime;
         }
         m_channelParams[0].baselineThreshold = m_caenParams.blthr;
-        m_channelParams[0].bltmo = m_caenParams.bltmo;
         m_channelParams[0].triggerHoldOff = m_caenParams.trgho;
         m_channelParams[0].pileUpRejection = m_caenParams.purh;
         m_channelParams[0].purgap = m_caenParams.purgap;
diff --git a/src/Editor/DigitizerPanel.cpp b/src/Editor/DigitizerPanel.cpp
index c025f03..3b500bc 100644
--- a/src/Editor/DigitizerPanel.cpp
+++ b/src/Editor/DigitizerPanel.cpp
@@ -133,9 +133,7 @@ namespace Daqromancy {
 			ImGui::TableSetupColumn("Record Length (ns)");
 			ImGui::TableSetupColumn("Event Aggregation");
 			ImGui::TableSetupColumn("Acq. Mode");
-			//ImGui::TableSetupColumn("DPP Acq. Mode");
 			ImGui::TableSetupColumn("Board IO Level");
-			//ImGui::TableSetupColumn("Trigger Mode");
 			ImGui::TableSetupColumn("Sync Mode");
 			ImGui::TableHeadersRow();
 
@@ -444,7 +442,31 @@ namespace Daqromancy {
 		static std::string tempString; //useful for comps in widgets
 		if (!m_digitizerEnabled)
 			ImGui::BeginDisabled();
-		if (ImGui::BeginTable("PSD Channel Parameters", 21, tableFlags | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY, ImVec2(0, 300)))
+
+		if (ImGui::BeginTable("PSD Board Parameters", 2, tableFlags))
+		{
+			ImGui::TableSetupColumn("Baseline Threshold (lsb)");
+			ImGui::TableSetupColumn("Trigger Hold-Off (ns)");
+			ImGui::TableHeadersRow();
+
+			ImGui::TableNextRow();
+			ImGui::TableNextColumn();
+			if (ImGui::InputInt("##baseThresh", &(m_psdChannels[0].baselineThreshold), 0, 0))
+			{
+				changed = true;
+			}
+
+			ImGui::TableNextColumn();
+			ImGui::TableNextColumn();
+			if (ImGui::InputInt("##trigHold", &(m_psdChannels[0]).triggerHoldOff, 0, 0))
+			{
+				changed = true;
+			}
+
+			ImGui::EndTable();
+		}
+
+		if (ImGui::BeginTable("PSD Channel Parameters", 17, tableFlags | ImGuiTableFlags_ScrollX | ImGuiTableFlags_ScrollY, ImVec2(0, 300)))
 		{
 			ImGui::TableSetupColumn("Channel");
 			ImGui::TableSetupColumn("Enable/Disable");
@@ -452,9 +474,7 @@ namespace Daqromancy {
 			ImGui::TableSetupColumn("DC Offset (%)");
 			ImGui::TableSetupColumn("Polarity");
 			ImGui::TableSetupColumn("Dynamic Range");
-			ImGui::TableSetupColumn("Baseline Threshold (lsb)");
 			ImGui::TableSetupColumn("Trigger Threshold (lsb)");
-			ImGui::TableSetupColumn("Trigger Hold-Off (ns)");
 			ImGui::TableSetupColumn("Self-Trigger");
 			ImGui::TableSetupColumn("Charge Sensitivity");
 			ImGui::TableSetupColumn("Short Gate (ns)");
@@ -465,8 +485,6 @@ namespace Daqromancy {
 			ImGui::TableSetupColumn("Discrimintaor Mode");
 			ImGui::TableSetupColumn("CFD Fraction");
 			ImGui::TableSetupColumn("CFD Delay (ns)");
-			ImGui::TableSetupColumn("PileUp Reject.");
-			ImGui::TableSetupColumn("Purity Gap");
 			ImGui::TableHeadersRow();
 
 			for (size_t i = 0; i < m_psdChannels.size(); i++)
@@ -527,21 +545,11 @@ namespace Daqromancy {
 					ImGui::EndCombo();
 				}
 				ImGui::TableNextColumn();
-				if (ImGui::InputInt(fmt::format("##baseThresh_{0}", i).c_str(), &channel.baselineThreshold, 0, 0))
-				{
-					changed = true;
-				}
-				ImGui::TableNextColumn();
 				if (ImGui::InputInt(fmt::format("##triggerThresh_{0}", i).c_str(), &channel.triggerThreshold, 0, 0))
 				{
 					changed = true;
 				}
 				ImGui::TableNextColumn();
-				if (ImGui::InputInt(fmt::format("##trigHold_{0}", i).c_str(), &channel.triggerHoldOff, 0, 0))
-				{
-					changed = true;
-				}
-				ImGui::TableNextColumn();
 				tempString = IntSwitchToString(channel.selfTrigger);
 				if (ImGui::BeginCombo(fmt::format("##selfTrig_{0}", i).c_str(), tempString.c_str()))
 				{
@@ -646,33 +654,47 @@ namespace Daqromancy {
 				{
 					changed = true;
 				}
-				ImGui::TableNextColumn();
-				tempString = PileUpModeToString(channel.pileUpRejection);
-				if (ImGui::BeginCombo(fmt::format("##purSwitch_{0}", i).c_str(), tempString.c_str()))
-				{
-					if (ImGui::Selectable("On", CAEN_DGTZ_DPP_PSD_PUR_Enabled == channel.pileUpRejection))
-					{
-						changed = true;
-						channel.discrminatorType = CAEN_DGTZ_DPP_PSD_PUR_Enabled;
-					}
-					if (ImGui::Selectable("Off", CAEN_DGTZ_DPP_PSD_PUR_DetectOnly == channel.pileUpRejection))
-					{
-						changed = true;
-						channel.discrminatorType = CAEN_DGTZ_DPP_PSD_PUR_DetectOnly;
-					}
-					ImGui::EndCombo();
-				}
-				ImGui::TableNextColumn();
-				if (ImGui::InputInt(fmt::format("##purityGap_{0}", i).c_str(), &channel.purgap, 0, 0))
-				{
-					changed = true;
-				}
 
 				if (!channel.isEnabled)
 					ImGui::EndDisabled();
 			}
 			ImGui::EndTable();
 		}
+
+		//Pile-up rejection is global to digitizer, but is special for psd. Control via channel 0.
+		if (ImGui::BeginTable("Pile-up Rejection", 2, tableFlags))
+		{
+			ImGui::TableSetupColumn("PileUp Reject.");
+			ImGui::TableSetupColumn("Purity Gap");
+			ImGui::TableHeadersRow();
+
+			ImGui::TableNextRow();
+			ImGui::TableNextColumn();
+
+			tempString = PileUpModeToString(m_psdChannels[0].pileUpRejection);
+			if (ImGui::BeginCombo("##purSwitch", tempString.c_str()))
+			{
+				if (ImGui::Selectable("On", CAEN_DGTZ_DPP_PSD_PUR_Enabled == m_psdChannels[0].pileUpRejection))
+				{
+					changed = true;
+					m_psdChannels[0].pileUpRejection = CAEN_DGTZ_DPP_PSD_PUR_Enabled;
+				}
+				if (ImGui::Selectable("Off", CAEN_DGTZ_DPP_PSD_PUR_DetectOnly == m_psdChannels[0].pileUpRejection))
+				{
+					changed = true;
+					m_psdChannels[0].pileUpRejection = CAEN_DGTZ_DPP_PSD_PUR_DetectOnly;
+				}
+				ImGui::EndCombo();
+			}
+
+			ImGui::TableNextColumn();
+			if (ImGui::InputInt("##purityGap", &(m_psdChannels[0].purgap), 0, 0))
+			{
+				changed = true;
+			}
+
+			ImGui::EndTable();
+		}
 		if (!m_digitizerEnabled)
 			ImGui::EndDisabled();
 		return changed;