diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc
index 7fa0b608c..c7ae99269 100644
--- a/rtgui/locallabtools.cc
+++ b/rtgui/locallabtools.cc
@@ -1016,19 +1016,27 @@ void LocallabColor::updateguicolor(int spottype)
             if(spottype == 3) {
                 invers->hide();
                 sensi->hide();
-                showmaskcolMethod->set_active(0);               
+                showmaskcolMethod->set_active(0);
+                expmaskcol1->hide();
+                expmaskcol->hide();
+                exprecov->hide();
+                enaColorMask->set_active(false);
                 previewcol->hide();
                 previewcol->set_active(false);
                 resetMaskView();
             } else {
                 invers->show();
                 sensi->show();
+                expmaskcol1->show();
+                expmaskcol->show();
+                exprecov->show();
                 if(!invers->get_active()) {
                     previewcol->show();
                 } else {
                     previewcol->hide();
                 }
-                
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
+
             }
             enableListener();
 
@@ -3027,17 +3035,24 @@ void LocallabExposure::updateguiexpos(int spottype)
                 sensiex->hide();
                 previewexe->hide();
                 showmaskexpMethod->set_active(0);
+                enaExpMask->set_active(false);
+                enaExpMaskaft->set_active(false);
                 previewexe->set_active(false);
-                
+                expmaskexp->hide();
+                exprecove->hide();
                 resetMaskView();
            } else {
                 inversex->show();
                 sensiex->show();
+                expmaskexp->show();
+                exprecove->show();
+
                 if(!inversex->get_active()) {
                     previewexe->show();
                 } else {
                     previewexe->hide();
                 }
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
             }
             enableListener();
 
@@ -4557,16 +4572,22 @@ void LocallabShadow::updateguishad(int spottype)
                 sensihs->hide();
                 showmaskSHMethod->set_active(0);
                 previewsh->hide();
+                exprecovs->hide();
+                expmasksh->hide();
+                enaSHMask->set_active(false);
                 previewsh->set_active(false);
                 resetMaskView();
             } else {
                 sensihs->show();
                 inverssh->show();
+                exprecovs->show();
+                expmasksh->show();
                 if(!inverssh->get_active()) {
                     previewsh->show();
                 } else {
                     previewsh->hide();
                 }
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
                 
             }
             enableListener();
@@ -5735,11 +5756,18 @@ void LocallabVibrance::updateguivib(int spottype)
                 sensiv->hide();
                 showmaskvibMethod->set_active(0);
                 previewvib->hide();
+                enavibMask->set_active(false);
                 previewvib->set_active(false);
+                exprecovv->hide();
+                expmaskvib->hide();
                 resetMaskView();
             } else {
                 sensiv->show();
                 previewvib->show();
+                exprecovv->show();
+                expmaskvib->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
+
             }
             enableListener();
 
@@ -7534,11 +7562,14 @@ void LocallabBlur::updateguiblur(int spottype)
                 sensibn->hide();
                 sensiden->hide();
                 invbl->hide();
-
+                expmaskbl->hide();
+                enablMask->set_active(false);
             } else {
                 sensibn->show();
                 sensiden->show();
                 invbl->show();
+                expmaskbl->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
 
             }
             enableListener();
diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc
index b13148cd1..1ef6d7202 100644
--- a/rtgui/locallabtools2.cc
+++ b/rtgui/locallabtools2.cc
@@ -428,6 +428,11 @@ void LocallabTone::updateguitone(int spottype)
 
             if(spottype == 3) {
                 sensitm->hide();
+                exprecovt->hide();
+                expmasktm->hide();
+                enatmMask->set_active(false);
+                enatmMaskaft->set_active(false);
+                
              //   showmasktmMethodConn.block(true);
                 showmasktmMethod->set_active(0);
              //   showmasktmMethodConn.block(false);
@@ -439,6 +444,10 @@ void LocallabTone::updateguitone(int spottype)
             } else {
                 sensitm->show();
                 previewtm->show();
+                exprecovt->show();
+                expmasktm->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
+                
            }
             enableListener();
 
@@ -1188,8 +1197,15 @@ void LocallabRetinex::updateguireti(int spottype)
 
             if(spottype == 3) {
                 sensih->hide();
+                exprecovr->hide();
+                expmaskreti->hide();
+                enaretiMask->set_active(false);
+                enaretiMasktmap->set_active(false);
             } else {
                 sensih->show();
+                exprecovr->show();
+                expmaskreti->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
             }
             enableListener();
 
@@ -3123,10 +3139,15 @@ void LocallabContrast::updateguicont(int spottype)
                 previewlc->hide();
                 previewlc->set_active(false);
                 resetMaskView();
-                
+                enalcMask->set_active(false);
+                exprecovw->hide();
+                expmasklc->hide();
             } else {
                 sensilc->show();
                 previewlc->show();
+                exprecovw->show();
+                expmasklc->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
             }
             enableListener();
 
@@ -4881,8 +4902,14 @@ void LocallabCBDL::updateguicbdl(int spottype)
 
             if(spottype == 3) {
                 sensicb->hide();
+                exprecovcb->hide();
+                expmaskcb->hide();
+                enacbMask->set_active(false);
             } else {
+                exprecovcb->show();
+                expmaskcb->show();
                 sensicb->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
             }
             enableListener();
 
@@ -5843,11 +5870,16 @@ void LocallabLog::updateguilog(int spottype)
                 showmaskLMethod->set_active(0);               
                 previewlog->hide();
                 previewlog->set_active(false);
+                enaLMask->set_active(false);
                 resetMaskView();
-                
+                exprecovl->hide();
+                expmaskL->hide();
             } else {
                 sensilog->show();
                 previewlog->show();
+                exprecovl->show();
+                expmaskL->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
             }
             enableListener();
 
@@ -7248,14 +7280,36 @@ void LocallabMask::updateguimask(int spottype)
 
             if(spottype == 3) {
                 sensimask->hide();
-                showmask_Method->set_active(0);               
+                showmask_Method->set_active(0);
                 previewmas->hide();
                 previewmas->set_active(false);
                 resetMaskView();
+                blendmask->hide();
+                blendmaskab->hide();
+                softradiusmask->hide();
+                showmask_Method->hide();
+                enamask->hide();
+                enamask->set_active(false);
+                mask_CurveEditorG->hide();
+                struFrame->hide();
+                blurFrame->hide();
+                toolmaskFrame->hide();
                 
             } else {
                 sensimask->show();
                 previewmas->show();
+                blendmask->show();
+                blendmaskab->show();
+                softradiusmask->show();
+                showmask_Method->show();
+                enamask->show();
+                mask_CurveEditorG->show();
+                struFrame->show();
+                blurFrame->show();
+                toolmaskFrame->show();
+                
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
+                
            }
             enableListener();
 
@@ -9158,11 +9212,18 @@ void Locallabcie::updateguicie(int spottype)
                 sensicie->hide();
                 showmaskcieMethod->set_active(0);
                 previewcie->hide();
+                exprecovcie->hide();
+                expmaskcie->hide();
+                enacieMask->set_active(false);
+                enacieMaskall->set_active(false);
                 previewcie->set_active(false);
                 resetMaskView();
             } else {
                 sensicie->show();
                 previewcie->show();
+                exprecovcie->show();
+                expmaskcie->show();
+                updateGUIToMode(static_cast<modeType>(complexity->get_active_row_number()));
            }
             enableListener();