diff --git a/ef/ef0400a.uml b/ef/ef0400a.uml
index a6cfe688a..57c3f9d70 100755
--- a/ef/ef0400a.uml
+++ b/ef/ef0400a.uml
@@ -1,7 +1,23 @@
 // DEFINIZIONE MASCHERA PER LA ELIMINAZIONE DEGLI EFFETTI
 #include "ef0400.h"
 
-PAGE "Eliminazione Effetti" -1 -1 57 14
+TOOLBAR "topbar" 0 0 0 2
+
+BUTTON DLG_OK 9 2
+BEGIN
+  PROMPT -13 -1 ""
+END
+
+BUTTON DLG_CANCEL 9 2
+BEGIN
+  PROMPT -23 -1 ""
+END
+
+#include <helpbar.h>
+
+ENDPAGE
+
+PAGE "Eliminazione Effetti" 0 2 0 0
 
 LIST F_TIPOSEL 20
 BEGIN
@@ -99,21 +115,6 @@ BEGIN
   WARNING "Data limite superiore  non valida"
 END
 
-BUTTON DLG_OK 9 2
-BEGIN
-  PROMPT -13 -1 ""
-END
-
-BUTTON DLG_CANCEL 9 2
-BEGIN
-  PROMPT -23 -1 ""
-END
-
-BUTTON DLG_QUIT 9 2
-BEGIN
-  PROMPT -33 -1 ""
-END
-
 ENDPAGE
 ENDMASK
 
diff --git a/ef/ef0500a.uml b/ef/ef0500a.uml
index cb4247541..fabee43b4 100755
--- a/ef/ef0500a.uml
+++ b/ef/ef0500a.uml
@@ -1,6 +1,10 @@
 #include "ef0500.h"
 
-PAGE "Emissione Effetti e Distinte" -1 -1 76 15
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
+PAGE "Emissione Effetti e Distinte" 0 2 0 0
 
 RADIOBUTTON F_TIPOEMIS 39
 BEGIN
@@ -123,16 +127,6 @@ BEGIN
   GROUP 2 
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 ENDMASK
 
diff --git a/ef/ef0600a.uml b/ef/ef0600a.uml
index 8820f91b5..a22597fe4 100755
--- a/ef/ef0600a.uml
+++ b/ef/ef0600a.uml
@@ -1,8 +1,11 @@
 // DEFINIZIONE MASCHERA PER LE STAMPE DI CONTROLLO DEGLI EFFETTI
-
 #include "ef0600.h"
 
-PAGE "Stampe di Controllo Effetti" -1 -1 78 15
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
+PAGE "Stampe di Controllo Effetti" 0 2 0 0
 
 DATE F_DATA_STAMPA
 BEGIN
@@ -237,24 +240,12 @@ BEGIN
   //WARNING "Limite superiore  non valido"
 END 
 
-//TEXT DLG_NULL
-//BEGIN
-// PROMPT 2 10 "Dalla Data  "
-// GROUP 3
-//END
-
 DATA F_DA_DATA3
 BEGIN      
   PROMPT 2 10 "Dalla Data "
   GROUP 3
 END
 
-//TEXT DLG_NULL
-//BEGIN
-// PROMPT 30 10 "Alla Data  "
-// GROUP 3
-//END
-
 DATA F_A_DATA3
 BEGIN         
   PROMPT 30 10 "Alla Data "
@@ -354,16 +345,6 @@ BEGIN
   WARNING "Data limite superiore  non valida"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END 
-
 ENDPAGE
 ENDMASK
  
diff --git a/ef/ef0700.cpp b/ef/ef0700.cpp
index 808ce3c8c..f27bf3756 100755
--- a/ef/ef0700.cpp
+++ b/ef/ef0700.cpp
@@ -1,6 +1,6 @@
 #include <tabapp.h>
 
-#include "batbbnp.h" 
+#include "eftbbnp.h" 
 
 ////////////////////////////////////////////////////
 // Classe per la gestione della Tabella di Ditta  //
diff --git a/ef/ef0800a.uml b/ef/ef0800a.uml
index 88c4b2868..9e5c934a6 100755
--- a/ef/ef0800a.uml
+++ b/ef/ef0800a.uml
@@ -1,6 +1,10 @@
 #include "ef0800a.h"
 
-PAGE "Contabilizzazione effetti" -1 -1 60 8
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
+PAGE "Contabilizzazione effetti" 0 2 0 0
 
 NUMBER F_DISTINTE 4
 BEGIN
@@ -35,17 +39,6 @@ BEGIN
   PROMPT 2 6 "Dettaglio rate su effetti passivi"
 END
 
-
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 
 ENDMASK
diff --git a/ef/ef0900a.uml b/ef/ef0900a.uml
index 3d0f45eff..c817adee1 100755
--- a/ef/ef0900a.uml
+++ b/ef/ef0900a.uml
@@ -1,17 +1,7 @@
 #include "ef0900a.h"
 
 TOOLBAR "topbar" 0 0 0 2
-
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -11 ""
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -22 -11 ""
-END
-
+#include <stdbar.h>
 ENDPAGE
 
 PAGE "Parametri effetti"  0 2 0 0