diff --git a/padres.xml b/padres.xml
index 291b63820b2ef43b1fe9f62e1dacdd1b96572356..acd8a8bec6ab4349c01ebe20477f7e44ad6274cd 100644
--- a/padres.xml
+++ b/padres.xml
@@ -1719,7 +1719,7 @@
       </element>
       
         <element exename="caen-digitizer-accelerator-gui   pos/diagnostics/photo_current_pos.01" executable="yes">
-	    <title>Photo current POS.01</title>
+	    <title>Photo current POS</title>
 	    <description>Caen Digitizer</description>
 	</element>
 
@@ -1742,13 +1742,7 @@
       </element>
     </folder>
     <!--3 Way-->
-    <folder folded="yes" envpath="/runtime/bin">
-        <title>Feedback</title>
-	<element exename="mimo-fb-gui pos/feedback/fb_ccd_pos.03 -title  &quot;Feedback ACDC Timer (mimofb)&quot;  " executable="yes">
-            <title>Feedback ACDC Timer</title>
-            <description>mimofb panel for fb_ccd_pos.03</description>
-        </element>
-    </folder>
+    
     <!--POS TMR-->
     <folder folded="yes" envpath="/runtime/bin" treeColor="#6eef88">
       <title>POS TMR</title>
@@ -1805,7 +1799,13 @@
           <title>YAG Trinity B (TMR)</title>
           <description>pyd_pos_tmrb.01</description>
       </element>
-      
+      <folder folded="yes" envpath="/runtime/bin">
+          <title>Feedback</title>
+          <element exename="mimo-fb-gui pos/feedback/fb_ccd_pos.03 -title  &quot;Feedback Delay Line TMR (mimofb)&quot;  " executable="yes">
+              <title>Feedback Delay Line TMR</title>
+              <description>mimofb panel for fb_ccd_pos.03</description>
+          </element>
+      </folder>   
       <folder folded="yes" envpath="/runtime/bin">
         <title>Diagnostics</title>
             <element exename="gigecam-gui pos_tmr/diagnostics/ccd_pos_tmr.01 ccd_pos_tmr.01  -title &quot;CCD TMR Coherence&quot;" executable="yes">
@@ -1865,7 +1865,7 @@
                 </element>
         
             </folder> <!-- POS TMR / diagnostics -->
-            
+    
       <folder folded="yes" envpath="/runtime/bin">
         <title>Pump/Probe Selections</title>
         <element exename="galilselector pos/moverNd/pos_tmr_beamsplitter.00 -nopos -e -title &quot;Beamsplitter&quot;" executable="yes">
@@ -1991,8 +1991,8 @@
           <title>Laser Pointer: Tip/Tilt (TMX)</title>
           <description>tiptilt_pos_tmx.01 </description>
       </element>
-      <element exename="galilaxis -e pos/movers/p_mrc_pos_tmx.01 pos/movers/r_mrc_pos_tmx.01 pos/movers/yaw_mrc_pos_tmx.01 pos/movers/t_mrc_pos_tmx.01 -title &quot;TMX Pitch,Roll, Yaw,t&quot;" executable="yes">
-        <title>TIMEX Pitch,Roll,Yaw,Transverse</title>
+      <element exename="galilaxis -e pos/movers/p_mrc_pos_tmx.01 pos/movers/r_mrc_pos_tmx.01 pos/movers/t_mrc_pos_tmx.01 -title &quot;TMX Pitch,Roll,Transverse&quot;" executable="yes">
+        <title>TIMEX Pitch,Roll,Transverse</title>
         <description>*mrc_pos_tmx.01</description>
       </element>
       
@@ -2001,11 +2001,6 @@
           <description>pz_mrc_pos_tmx_01 </description>
       </element>
       
-      <element exename="atkpanel pos_tmx/piezo/pz_mrc_pos_tmx_02 -title &quot;TIMEX Ellipsoidal YAW&quot;" executable="yes" path="/usr/local/tango-9.3.3/bin">
-          <title>TIMEX Ellipsoidal YAW(2)</title>
-          <description>pz_mrc_pos_tmx_02</description>
-      </element>
-      
       <element exename="galilselector pos/mover1d/y_mrc_pos_tmx.01 -title &quot;TIMEX Switching Ellipsoidal/Plane mirror&quot;" executable="yes">
         <title>TIMEX Switching: Ellipsoidal/Plane mirror</title>
         <description>*mrc_pos_tmx.01</description>