diff --git a/slsDetectorGui/forms/form_tab_measurement.ui b/slsDetectorGui/forms/form_tab_measurement.ui
index b7cad8434..cf912b679 100644
--- a/slsDetectorGui/forms/form_tab_measurement.ui
+++ b/slsDetectorGui/forms/form_tab_measurement.ui
@@ -523,11 +523,6 @@ Maximum value is 3. <br>
          <string>Trigger Exposure Series</string>
         </property>
        </item>
-       <item>
-        <property name="text">
-         <string>Trigger Frame</string>
-        </property>
-       </item>
        <item>
         <property name="text">
          <string>Trigger Readout</string>
@@ -543,11 +538,6 @@ Maximum value is 3. &lt;br&gt;
          <string>Gated with Start Trigger</string>
         </property>
        </item>
-       <item>
-        <property name="text">
-         <string>External Trigger Window</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item row="1" column="0">
diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h
index 4e9b42e60..5f34f978a 100644
--- a/slsDetectorGui/include/qTabMeasurement.h
+++ b/slsDetectorGui/include/qTabMeasurement.h
@@ -180,7 +180,7 @@ private:
 	/** detector type */
 	slsDetectorDefs::detectorType detType;
 	/** enum for the timing mode */
-	enum{None, Auto, Trigger_Exp_Series, Trigger_Frame, Trigger_Readout, Gated, Gated_Start, Trigger_Window, NumTimingModes};
+	enum{None, Auto, Trigger_Exp_Series, Trigger_Readout, Gated, Gated_Start, NumTimingModes};
 	/** timer to update the progress*/
 	QTimer *progressTimer;
 	/** tool tip variables*/
diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp
index d02182106..0b3858326 100644
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@@ -134,28 +134,22 @@ void qTabMeasurement::SetupTimingMode(){
 		switch(detType){
 		case slsDetectorDefs::MYTHEN:
 			item[(int)Trigger_Exp_Series]->setEnabled(true);
-			item[(int)Trigger_Frame]->setEnabled(false);
 			item[(int)Trigger_Readout]->setEnabled(true);
 			item[(int)Gated]->setEnabled(true);
 			item[(int)Gated_Start]->setEnabled(true);
-			item[(int)Trigger_Window]->setEnabled(false);
 			break;
 		case slsDetectorDefs::EIGER:
 			item[(int)Trigger_Exp_Series]->setEnabled(false);/**not implemented yet*/
-			item[(int)Trigger_Frame]->setEnabled(true);
 			item[(int)Trigger_Readout]->setEnabled(false);
-			item[(int)Gated]->setEnabled(false);
+			item[(int)Gated]->setEnabled(true);
 			item[(int)Gated_Start]->setEnabled(false);
-			item[(int)Trigger_Window]->setEnabled(true);
 			break;
 		case slsDetectorDefs::MOENCH:
 		case slsDetectorDefs::GOTTHARD:
 			item[(int)Trigger_Exp_Series]->setEnabled(true);
-			item[(int)Trigger_Frame]->setEnabled(false);
 			item[(int)Trigger_Readout]->setEnabled(false);
 			item[(int)Gated]->setEnabled(false);
 			item[(int)Gated_Start]->setEnabled(false);
-			item[(int)Trigger_Window]->setEnabled(false);
 			break;
 		default:
 			qDefs::Message(qDefs::CRITICAL,"Unknown detector type.","qTabMeasurement::SetupTimingMode");
@@ -645,7 +639,11 @@ void qTabMeasurement::SetTimingMode(int mode){
 			success = true;
 		break;
 	case Trigger_Exp_Series://#Frames, #Triggers, ExpTime, Period, Delay
+		if(detType == slsDetectorDefs::EIGER)//more than 1 frame per trigger yet to be implemented
+			spinNumFrames->setValue(1);
+		else{
 		lblNumFrames->setEnabled(true);		spinNumFrames->setEnabled(true);
+		}
 		lblExpTime->setEnabled(true);		spinExpTime->setEnabled(true);			comboExpUnit->setEnabled(true);
 		lblPeriod->setEnabled(true);		spinPeriod->setEnabled(true);			comboPeriodUnit->setEnabled(true);
 		lblNumTriggers->setEnabled(true);	spinNumTriggers->setEnabled(true);
@@ -653,13 +651,6 @@ void qTabMeasurement::SetTimingMode(int mode){
 		if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_EXPOSURE)==slsDetectorDefs::TRIGGER_EXPOSURE)
 			success = true;
 		break;
-	case Trigger_Frame://ExpTime, #Frames
-		lblNumFrames->setEnabled(true);		spinNumFrames->setEnabled(true);
-		lblExpTime->setEnabled(true);		spinExpTime->setEnabled(true);			comboExpUnit->setEnabled(true);
-		lblNumTriggers->setEnabled(false);	spinNumTriggers->setEnabled(false);
-		if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_FRAME)==slsDetectorDefs::TRIGGER_FRAME)
-			success = true;
-		break;
 	case Trigger_Readout://#Frames, ExpTime, Period, Delay
 		spinNumTriggers->setValue(1);
 		lblNumFrames->setEnabled(true);		spinNumFrames->setEnabled(true);
@@ -671,8 +662,12 @@ void qTabMeasurement::SetTimingMode(int mode){
 		break;
 	case Gated://#Frames, #Gates
 		spinNumTriggers->setValue(1);
-		lblNumFrames->setEnabled(true);		spinNumFrames->setEnabled(true);
+		if(detType == slsDetectorDefs::EIGER)//more than 1 frame per trigger yet to be implemented
+			spinNumGates->setValue(1);
+		else{
 		lblNumGates->setEnabled(true);		spinNumGates->setEnabled(true);
+		}
+		lblNumFrames->setEnabled(true);		spinNumFrames->setEnabled(true);
 		if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_FIX_NUMBER)==slsDetectorDefs::GATE_FIX_NUMBER)
 			success = true;
 		break;
@@ -685,11 +680,6 @@ void qTabMeasurement::SetTimingMode(int mode){
 		if(myDet->setExternalCommunicationMode(slsDetectorDefs::GATE_WITH_START_TRIGGER)==slsDetectorDefs::GATE_WITH_START_TRIGGER)
 			success = true;
 		break;
-	case Trigger_Window://#Frames
-		lblNumFrames->setEnabled(true);		spinNumFrames->setEnabled(true);
-		if(myDet->setExternalCommunicationMode(slsDetectorDefs::TRIGGER_WINDOW)==slsDetectorDefs::TRIGGER_WINDOW)
-			success = true;
-		break;
 	default:
 		//This should never happen
 		qDefs::Message(qDefs::CRITICAL,"Timing mode unknown to GUI","qTabMeasurement::SetTimingMode");