diff --git a/mr/mr0.cpp b/mr/mr0.cpp
index 491d119e8..cc25aad7f 100755
--- a/mr/mr0.cpp
+++ b/mr/mr0.cpp
@@ -4,16 +4,12 @@
 
 int main(int argc, char** argv)
 {
-  int a = argc > 1 ? (argv[1][1] - '0') : 0;
+  const int a = argc > 1 ? (argv[1][1] - '0') : 0;
   switch (a)
   {
-  case 3:
-    mr0400(argc,argv); break; // parametri ditta
-  case 4:
-    mr0500(argc,argv); break; // rilevazione produzione
-  case 0:
-  default:
-    mr0100(argc, argv);
+  case  3: mr0400(argc, argv); break; // parametri ditta
+  case  4: mr0500(argc, argv); break; // rilevazione produzione
+  default: mr0100(argc, argv);break;  // M.R.P.
   }
   return 0;
 }
diff --git a/mr/mr0400.cpp b/mr/mr0400.cpp
index 1d0a1242a..25341f466 100755
--- a/mr/mr0400.cpp
+++ b/mr/mr0400.cpp
@@ -61,10 +61,8 @@ public:
   virtual bool preprocess_config (TMask& mask, TConfig& config);
   virtual bool postprocess_config (TMask& mask, TConfig& config);
   virtual bool user_create();
-  virtual bool user_destroy();
 
   TConf_MRP_application() : TConfig_application(CONFIG_DITTA) { _mask = NULL;}
-  virtual ~TConf_MRP_application() {}
 };
 
 void TConf_MRP_application::load_mask()
@@ -185,20 +183,13 @@ bool TConf_MRP_application::postprocess_config (TMask& mask, TConfig& c)
 
 bool TConf_MRP_application::user_create()
 {
-  TConfig conf(CONFIG_DITTA);
-  conf.set( "EdMask", "mr0400a", "mr");
-  return TRUE;
-}
-
-bool TConf_MRP_application::user_destroy()
-{
-  return TRUE;
+  ini_set_string(CONFIG_DITTA, "mr", "EdMask", "mr0400a");
+  return true;
 }
 
 int mr0400(int argc, char* argv[])
 {
   TConf_MRP_application app;
-
-  app.run(argc, argv, TR("Parametri gestione MRP"));
+  app.run(argc, argv, TR("Parametri M.R.P."));
   return 0;
 }
diff --git a/mr/mr0400a.uml b/mr/mr0400a.uml
index 6286677ae..c151a58e2 100755
--- a/mr/mr0400a.uml
+++ b/mr/mr0400a.uml
@@ -11,7 +11,7 @@ END
 
 ENDPAGE
 
-PAGE "Parametri ditta"  0 0 0 0 
+PAGE "Parametri M.R.P." 0 2 0 0 
 
 BOOLEAN F_GESTIMPIANTI
 BEGIN 
@@ -50,7 +50,6 @@ BEGIN
   OUTPUT F_DEFAULT_IMP CODTAB
 END 
 
-
 LISTBOX F_NTURNI 3
 BEGIN
   PROMPT 2 4 "Numero turni      "
@@ -196,7 +195,6 @@ BEGIN
   GROUP 3 13 14 15 16 17 18 28 38
 END
 
-
 NUMBER F_T4HINIZIO 2
 BEGIN
   PROMPT 2 8 "Ora inizio quarto turno  "
@@ -589,4 +587,4 @@ END
 
 ENDPAGE
 
-ENDMASK
\ No newline at end of file
+ENDMASK
diff --git a/mr/mr2200a.uml b/mr/mr2200a.uml
index 7413906e7..9858476a8 100755
--- a/mr/mr2200a.uml
+++ b/mr/mr2200a.uml
@@ -784,7 +784,7 @@ END
 
 BUTTON F_MSP_RESORT 9
 BEGIN
-  PROMPT 68 3 "Riordina"
+  PROMPT 68 4 "Riordina"
 END
 
 //BUTTON F_CHECK_MSP 9 2
@@ -935,19 +935,19 @@ END
 
 BUTTON F_PRIORITY_HI 2 2
 BEGIN
-  PROMPT -1 11 "Su'"
+  PROMPT -1 11 "^"
   PICTURE USER_BMP_ARROWUP
 END
 
 BUTTON F_PRIORITY_ST 2 2
 BEGIN
-  PROMPT -1 13 "Su'"
+  PROMPT -1 13 "Stop"
   PICTURE  BMP_STOPREC 
 END
 
 BUTTON F_PRIORITY_LO 2 2
 BEGIN
-  PROMPT -1 15 "Giu'"
+  PROMPT -1 15 "v"
   PICTURE USER_BMP_ARROWDOWN
 END
 
diff --git a/mr/mrplib.cpp b/mr/mrplib.cpp
index 6f63240a7..f9b01ccd4 100755
--- a/mr/mrplib.cpp
+++ b/mr/mrplib.cpp
@@ -771,7 +771,7 @@ long TCalendar_win::handler(WINDOW win, EVENT* ep)
               calname << '"'<< _calendario->linea() << '"';
               break;
           }
-          TMask m(calname, 1, 40, 8);
+          TMask m(calname, 1, 40, 11);
           m.add_static(DLG_NULL, 0, TR("Turni del giorno "), 1, 1);
           m.add_date(101, 0, "", 1, 2, "D");
           m.add_string(102, 0, "", 19, 2, 9, "D");
@@ -878,11 +878,9 @@ void TCalendar_win::update()
 	  set_brush(FOCUS_BACK_COLOR);
 		hide_pen();
 
-
 		for (TDate d = from ; d <= to; ++d)
 		{
 			RCT rect;
-			
 			rect.left = rct.right * (d.day() + 1) / 33;
 			rect.right = rct.right * (d.day() + 2) / 33;
 			rect.top = rct.bottom * d.month() / 13;