diff --git a/modeling/AVATAR/AirbusDoor.xml b/modeling/AVATAR/AirbusDoor.xml
index 45124e4d6efc3faaf3ff3cffcfce71e02f076817..d7beb2e4f7a2a6716524e9ae4970229125b3db41 100644
--- a/modeling/AVATAR/AirbusDoor.xml
+++ b/modeling/AVATAR/AirbusDoor.xml
@@ -872,7 +872,7 @@
 
 
 <Modeling type="AVATAR Design" nameTab="AVATAR Design" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1900" minY="10" maxY="1900" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1900" minY="10" maxY="1900" zoom="1.0" >
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
@@ -1706,6 +1706,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1734,6 +1735,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1762,6 +1764,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="ok = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1791,6 +1794,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="value = pilotsInCabin - 1" />
 <actions value="ok = false" />
 </extraparam>
@@ -1851,6 +1855,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1879,6 +1884,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1907,6 +1913,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1935,6 +1942,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1963,6 +1971,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1991,6 +2000,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2348,6 +2358,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2376,6 +2387,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2404,6 +2416,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2432,6 +2445,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2460,6 +2474,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2488,6 +2503,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2516,6 +2532,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="ruleAtLeastTwoPersonsInTheCockpit = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -2545,6 +2562,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="ruleAtLeastOnePilotInTheCockpit = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -2574,6 +2592,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2602,6 +2621,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2630,6 +2650,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3009,6 +3030,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3037,6 +3059,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3065,6 +3088,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3123,6 +3147,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3151,6 +3176,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3361,6 +3387,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3419,6 +3446,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3447,6 +3475,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3475,6 +3504,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3503,6 +3533,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3713,6 +3744,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="open = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -3742,6 +3774,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3770,6 +3803,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="open = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -3799,6 +3833,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3827,6 +3862,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="fault = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -3856,6 +3892,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3884,6 +3921,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="fault = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -3913,6 +3951,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3941,6 +3980,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3969,6 +4009,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -3997,6 +4038,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4025,6 +4067,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4053,6 +4096,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4081,6 +4125,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4533,6 +4578,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4561,6 +4607,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4619,6 +4666,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4647,6 +4695,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4675,6 +4724,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4822,6 +4872,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4850,6 +4901,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4888,6 +4940,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4916,6 +4969,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4944,6 +4998,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4982,6 +5037,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5010,6 +5066,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5038,6 +5095,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5066,6 +5124,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5094,6 +5153,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5122,6 +5182,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5150,6 +5211,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5178,6 +5240,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5206,6 +5269,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5234,6 +5298,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5262,6 +5327,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5290,6 +5356,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5318,6 +5385,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5346,6 +5414,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5699,6 +5768,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5727,6 +5797,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5755,6 +5826,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5783,6 +5855,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="emergency = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -5812,6 +5885,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5840,6 +5914,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="unlocked = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -5869,6 +5944,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5897,6 +5973,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="doorOpened = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -5926,6 +6003,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5954,6 +6032,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -5982,6 +6061,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6010,6 +6090,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6038,6 +6119,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="doorOpened = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6067,6 +6149,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6095,6 +6178,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="unlocked = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6124,6 +6208,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6152,6 +6237,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="unlocked = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6181,6 +6267,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6219,6 +6306,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="buzzerOn = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6248,6 +6336,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6276,6 +6365,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="buzzerOn = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6305,6 +6395,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="callMade = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6334,6 +6425,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6362,6 +6454,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6390,6 +6483,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6418,6 +6512,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6446,6 +6541,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="doorOpened = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6475,6 +6571,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6503,6 +6600,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6531,6 +6629,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6559,6 +6658,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6587,6 +6687,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="faultDone = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6616,6 +6717,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="unlocked = true" />
 </extraparam>
 </SUBCOMPONENT>
@@ -6645,6 +6747,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6673,6 +6776,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="emergency = false" />
 </extraparam>
 </SUBCOMPONENT>
@@ -7490,6 +7594,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="passengersInCockpit = passengersInCockpit + 1" />
 <actions value="PassengersInCabin = PassengersInCabin - 1" />
 </extraparam>
@@ -7520,6 +7625,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="pilotsInCockpit = pilotsInCockpit + 1" />
 <actions value="pilotsInCabin = pilotsInCabin - 1" />
 </extraparam>
@@ -7550,6 +7656,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7578,6 +7685,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7606,6 +7714,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7634,6 +7743,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="pilotsInCockpit = pilotsInCockpit - 1" />
 <actions value="pilotsInCabin = pilotsInCabin + 1" />
 </extraparam>
@@ -7664,6 +7774,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7692,6 +7803,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="cabinCrewInCabin = cabinCrewInCabin - 1" />
 <actions value="cabinCrewInCockpit = cabinCrewInCockpit + 1" />
 </extraparam>
@@ -7722,6 +7834,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7750,6 +7863,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="cabinCrewInCabin = cabinCrewInCabin + 1" />
 <actions value="cabinCrewInCockpit = cabinCrewInCockpit - 1" />
 </extraparam>
@@ -7780,6 +7894,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7808,6 +7923,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7836,6 +7952,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="passengersInCockpit = passengersInCockpit - 1" />
 <actions value="PassengersInCabin = PassengersInCabin + 1" />
 </extraparam>
@@ -7866,6 +7983,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="personsInCockpit = pilotsInCockpit + cabinCrewInCockpit + passengersInCockpit" />
 </extraparam>
 </SUBCOMPONENT>
@@ -7895,6 +8013,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7923,6 +8042,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7951,6 +8071,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7979,6 +8100,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8007,6 +8129,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8396,6 +8519,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8424,6 +8548,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="peopleInside = peopleInside + 1" />
 </extraparam>
 </SUBCOMPONENT>
@@ -8453,6 +8578,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8481,6 +8607,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="peopleInside = peopleInside - 1" />
 </extraparam>
 </SUBCOMPONENT>
@@ -8510,6 +8637,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8538,6 +8666,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="peopleInside = peopleInside + 1" />
 </extraparam>
 </SUBCOMPONENT>
@@ -8567,6 +8696,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8595,6 +8725,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="peopleInside = peopleInside - 1" />
 </extraparam>
 </SUBCOMPONENT>
@@ -8624,6 +8755,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8652,6 +8784,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="peopleInside = peopleInside + 1" />
 </extraparam>
 </SUBCOMPONENT>
@@ -8681,6 +8814,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8709,6 +8843,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 <actions value="peopleInside = peopleInside - 1" />
 </extraparam>
 </SUBCOMPONENT>
@@ -8738,6 +8873,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8766,6 +8902,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8824,6 +8961,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8852,6 +8990,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8880,6 +9019,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8908,6 +9048,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -8936,6 +9077,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9299,6 +9441,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9327,6 +9470,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9375,6 +9519,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9403,6 +9548,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9431,6 +9577,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9469,6 +9616,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9497,6 +9645,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9525,6 +9674,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9573,6 +9723,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9601,6 +9752,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9629,6 +9781,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9657,6 +9810,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9685,6 +9839,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9713,6 +9868,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -9741,6 +9897,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10088,6 +10245,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10146,6 +10304,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10204,6 +10363,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10232,6 +10392,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10260,6 +10421,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10288,6 +10450,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10316,6 +10479,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10344,6 +10508,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10372,6 +10537,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10615,6 +10781,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10673,6 +10840,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10731,6 +10899,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10759,6 +10928,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10787,6 +10957,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10815,6 +10986,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10843,6 +11015,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10871,6 +11044,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10899,6 +11073,7 @@
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index b49c3749745e9bf9741b132d118d79a6301a732e..100f8e54bb1d7200461db989de36efa638849cdb 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -532,7 +532,6 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
 
 
     public TGComponent isOnOnlyMe(int x1, int y1) {
-
         if (GraphicLib.isInRectangle(x1, y1, x, y, width, height)) {
             return this;
         }
@@ -541,7 +540,6 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
 
     public String getStereotype() {
         return stereotype;
-
     }
 
     public String getNodeName() {
@@ -670,7 +668,7 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
         JDialogAvatarBlock jdab = new JDialogAvatarBlock(this.myAttributes, this.myMethods, this.mySignals, null, frame, "Setting attributes of " + value, "Attribute", tab, globalCode, true, mainCode);
         setJDialogOptions(jdab);
 //        jdab.setSize(650, 575);
-        GraphicLib.centerOnParent(jdab, 750, 775);
+        GraphicLib.centerOnParent(jdab, 780, 700);
         jdab.setVisible(true); // blocked until dialog has been closed
         //makeValue();
         //if (oldValue.equals(value)) {
diff --git a/src/main/java/ui/avatarbd/AvatarBDPragma.java b/src/main/java/ui/avatarbd/AvatarBDPragma.java
index ba9ff94db2f17332cf13421a745f58d7b3039e1f..dc9666557e223d2ecd276fda949489e7b371ccda 100755
--- a/src/main/java/ui/avatarbd/AvatarBDPragma.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPragma.java
@@ -47,7 +47,6 @@ import org.w3c.dom.NodeList;
 import ui.*;
 import ui.util.IconManager;
 import ui.window.JDialogPragma;
-import myutil.TraceManager;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ui/window/JDialogAvatarBlock.java b/src/main/java/ui/window/JDialogAvatarBlock.java
index 27c52e899d54d9119041d90b234526914c322b72..84de5ed00ab9154d7d5183844d9e5e3b3329274f 100755
--- a/src/main/java/ui/window/JDialogAvatarBlock.java
+++ b/src/main/java/ui/window/JDialogAvatarBlock.java
@@ -37,15 +37,12 @@
  */
 
 
-
-
 package ui.window;
 
 import myutil.Conversion;
 import myutil.GraphicLib;
 import ui.AvatarMethod;
 import ui.AvatarSignal;
-import ui.util.IconManager;
 import ui.TAttribute;
 
 import javax.swing.*;
@@ -61,10 +58,11 @@ import java.util.LinkedList;
  * Class JDialogAvatarBlock
  * Dialog for managing attributes, methods and signals of Avatar Blocks
  * Creation: 08/04/2010
- * @version 1.0 08/04/2010
+ *
  * @author Ludovic APVRILLE
+ * @version 1.0 08/04/2010
  */
-public class JDialogAvatarBlock extends JDialogBase implements ActionListener, ListSelectionListener  {
+public class JDialogAvatarBlock extends JDialogBase implements ActionListener, ListSelectionListener {
 
     private LinkedList<TAttribute> attributes, attributesPar, forbidden;
     private LinkedList<Boolean> initValues;
@@ -74,7 +72,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
 
     private boolean cancelled = true;
 
-    protected String [] globalCode;
+    protected String[] globalCode;
     protected JTextArea jtaGlobalCode;
     protected boolean hasGlobalCode;
     protected String mainCode;
@@ -121,8 +119,10 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
     private JButton downSignalButton;
     private JButton removeSignalButton;
 
-    /** Creates new form  */
-    public JDialogAvatarBlock(LinkedList<TAttribute> _attributes, LinkedList<AvatarMethod> _methods, LinkedList<AvatarSignal> _signals, LinkedList<TAttribute> _forbidden, Frame f, String title, String attrib, int _tab, String []_globalCode, boolean _hasGlobalCode, String _mainCode) {
+    /**
+     * Creates new form
+     */
+    public JDialogAvatarBlock(LinkedList<TAttribute> _attributes, LinkedList<AvatarMethod> _methods, LinkedList<AvatarSignal> _signals, LinkedList<TAttribute> _forbidden, Frame f, String title, String attrib, int _tab, String[] _globalCode, boolean _hasGlobalCode, String _mainCode) {
         super(f, title, true);
         frame = f;
         attributesPar = _attributes;
@@ -133,12 +133,12 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
 
 
         if (methodsPar == null) {
-            methodsPar = new LinkedList<AvatarMethod> ();
+            methodsPar = new LinkedList<AvatarMethod>();
             hasMethods = false;
         }
 
         if (signalsPar == null) {
-            signalsPar = new LinkedList<AvatarSignal> ();
+            signalsPar = new LinkedList<AvatarSignal>();
             hasSignals = false;
         }
 
@@ -150,22 +150,22 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
 
 
         forbidden = _forbidden;
-        initValues = new LinkedList<Boolean> ();
+        initValues = new LinkedList<Boolean>();
         this.attrib = attrib;
         tab = _tab;
 
-        attributes = new LinkedList<TAttribute> ();
-        methods = new LinkedList<AvatarMethod> ();
-        signals = new LinkedList<AvatarSignal> ();
+        attributes = new LinkedList<TAttribute>();
+        methods = new LinkedList<AvatarMethod>();
+        signals = new LinkedList<AvatarSignal>();
 
-        for(TAttribute attr: this.attributesPar)
-            this.attributes.add (attr.makeClone());
+        for (TAttribute attr : this.attributesPar)
+            this.attributes.add(attr.makeClone());
 
-        for(AvatarMethod meth: this.methodsPar)
-            this.methods.add (meth.makeClone());
+        for (AvatarMethod meth : this.methodsPar)
+            this.methods.add(meth.makeClone());
 
-        for(AvatarSignal sig: this.signalsPar)
-            this.signals.add (sig.makeClone());
+        for (AvatarSignal sig : this.signalsPar)
+            this.signals.add(sig.makeClone());
 
         initComponents();
         myInitComponents();
@@ -180,22 +180,26 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
 
     private void initComponents() {
 
-    	// Issue #41 Ordering of tabbed panes 
+        // Issue #41 Ordering of tabbed panes
         JTabbedPane tabbedPane = GraphicLib.createTabbedPane();//new JTabbedPane();
         Container c = getContentPane();
 
-        JPanel panelAttr = new JPanel(new BorderLayout());
-        JPanel panelMethod = new JPanel(new BorderLayout());
-        JPanel panelSignal = new JPanel(new BorderLayout());
+        //JPanel panelAttr = new JPanel(new FlowLayout());
+        //JPanel panelMethod = new JPanel(new BorderLayout());
+        //JPanel panelSignal = new JPanel(new BorderLayout());
         JPanel panelCode;
         GridBagLayout gridbag0 = new GridBagLayout();
         GridBagLayout gridbag1 = new GridBagLayout();
         GridBagLayout gridbag2 = new GridBagLayout();
         GridBagLayout gridbag3 = new GridBagLayout();
-       // GridBagLayout gridbag4 = new GridBagLayout();
+        // GridBagLayout gridbag4 = new GridBagLayout();
         GridBagLayout gridbag5 = new GridBagLayout();
         GridBagLayout gridbag6 = new GridBagLayout();
         GridBagLayout gridbag7 = new GridBagLayout();
+        GridBagLayout gridbag8 = new GridBagLayout();
+        GridBagLayout gridbag9 = new GridBagLayout();
+        GridBagLayout gridbag10 = new GridBagLayout();
+
         GridBagConstraints c0 = new GridBagConstraints();
         GridBagConstraints c1 = new GridBagConstraints();
         GridBagConstraints c2 = new GridBagConstraints();
@@ -204,23 +208,33 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         GridBagConstraints c5 = new GridBagConstraints();
         GridBagConstraints c6 = new GridBagConstraints();
         GridBagConstraints c7 = new GridBagConstraints();
+        GridBagConstraints c8 = new GridBagConstraints();
+        GridBagConstraints c9 = new GridBagConstraints();
+        GridBagConstraints c10 = new GridBagConstraints();
+
+        JPanel panelAttr = new JPanel(gridbag8);
+        JPanel panelMethod = new JPanel(gridbag9);
+        JPanel panelSignal = new JPanel(gridbag10);
+
 
         setFont(new Font("Helvetica", Font.PLAIN, 14));
-        c.setLayout(gridbag0);
+        //c.setLayout(gridbag0);
+        c.setLayout(new BorderLayout());
+
 
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
         panel1 = new JPanel();
         panel1.setLayout(gridbag1);
         panel1.setBorder(new javax.swing.border.TitledBorder("Adding " + attrib + "s"));
-        panel1.setPreferredSize(new Dimension(300, 450));
-	panel1.setMinimumSize(new Dimension(300, 200));
+        panel1.setPreferredSize(new Dimension(300, 550));
+        panel1.setMinimumSize(new Dimension(300, 200));
 
         panel2 = new JPanel();
         panel2.setLayout(gridbag2);
         panel2.setBorder(new javax.swing.border.TitledBorder("Managing " + attrib + "s"));
-        panel2.setPreferredSize(new Dimension(300, 450));
-	panel1.setMinimumSize(new Dimension(300, 200));
+        panel2.setPreferredSize(new Dimension(300, 550));
+        panel2.setMinimumSize(new Dimension(300, 200));
 
         // first line panel1
         c1.gridwidth = 1;
@@ -287,7 +301,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         panel1.add(addButton, c1);
 
         // 1st line panel2
-        listAttribute = new JList<TAttribute> (this.attributes.toArray (new TAttribute[0]));
+        listAttribute = new JList<TAttribute>(this.attributes.toArray(new TAttribute[0]));
         //listAttribute.setFixedCellWidth(150);
         //listAttribute.setFixedCellHeight(20);
         listAttribute.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -327,12 +341,12 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         panel3 = new JPanel();
         panel3.setLayout(gridbag3);
         panel3.setBorder(new javax.swing.border.TitledBorder("Adding methods"));
-        panel3.setPreferredSize(new Dimension(300, 450));
+        panel3.setPreferredSize(new Dimension(300, 550));
 
         panel4 = new JPanel();
         panel4.setLayout(gridbag2);
         panel4.setBorder(new javax.swing.border.TitledBorder("Managing methods"));
-        panel4.setPreferredSize(new Dimension(300, 450));
+        panel4.setPreferredSize(new Dimension(300, 550));
 
         // first line panel3
         c3.gridwidth = 1;
@@ -382,11 +396,11 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         panel3.add(addMethodButton, c3);
 
         // 1st line panel4
-        listMethod = new JList<AvatarMethod> (this.methods.toArray (new AvatarMethod[0]));
+        listMethod = new JList<AvatarMethod>(this.methods.toArray(new AvatarMethod[0]));
         listMethod.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         listMethod.addListSelectionListener(this);
         scrollPane = new JScrollPane(listMethod);
-        scrollPane.setSize(300, 450);
+        scrollPane.setSize(300, 550);
         c4.gridwidth = GridBagConstraints.REMAINDER; //end row
         c4.fill = GridBagConstraints.BOTH;
         c4.gridheight = 5;
@@ -472,7 +486,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         panel5.add(addSignalButton, c5);
 
         // 1st line panel6
-        listSignal = new JList<AvatarSignal> (this.signals.toArray (new AvatarSignal[0]));
+        listSignal = new JList<AvatarSignal>(this.signals.toArray(new AvatarSignal[0]));
         listSignal.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         listSignal.addListSelectionListener(this);
         scrollPane = new JScrollPane(listSignal);
@@ -540,14 +554,14 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         panelCode.add(jsp, c2);
 
         panelCode.add(new JLabel("Global code of block:"), c7);
-	panelCode.add(new JLabel("To implement a method m of block B: \"__userImplemented__B__m(...){...}\""), c7);
+        panelCode.add(new JLabel("To implement a method m of block B: \"__userImplemented__B__m(...){...}\""), c7);
         jtaGlobalCode = new JTextArea();
         jtaGlobalCode.setEditable(true);
         jtaGlobalCode.setMargin(new Insets(10, 10, 10, 10));
         jtaGlobalCode.setTabSize(3);
         String files = "";
         if (globalCode != null) {
-            for(int i=0; i<globalCode.length; i++) {
+            for (int i = 0; i < globalCode.length; i++) {
                 files += globalCode[i] + "\n";
             }
         }
@@ -559,19 +573,57 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
 
 
         // main panel;
-        panelAttr.add(panel1, BorderLayout.WEST);
-        panelAttr.add(panel2, BorderLayout.EAST);
+        //panelAttr.add(panel1, BorderLayout.WEST);
+        //panelAttr.add(panel2, BorderLayout.EAST);
+        c8.gridwidth = 1;
+        c8.gridheight = 10;
+        c8.weighty = 1.0;
+        c8.weightx = 1.0;
+        c8.fill = GridBagConstraints.HORIZONTAL;
+        panelAttr.add(panel1, c8);
+        c8.gridwidth = GridBagConstraints.REMAINDER; //end row
+        //c.add(tabbedPane, c0);
+
+        c8.gridwidth = 1;
+        c8.gridheight = 10;
+        panelAttr.add(panel2, c8);
+
         tabbedPane.addTab("Attributes", panelAttr);
 
         if (hasMethods) {
-            panelMethod.add(panel3, BorderLayout.WEST);
-            panelMethod.add(panel4, BorderLayout.EAST);
+            //panelMethod.add(panel3, BorderLayout.WEST);
+            //panelMethod.add(panel4, BorderLayout.EAST);
+            c9.gridwidth = 1;
+            c9.gridheight = 10;
+            c9.weighty = 1.0;
+            c9.weightx = 1.0;
+            c9.fill = GridBagConstraints.HORIZONTAL;
+            panelMethod.add(panel3, c9);
+            c9.gridwidth = GridBagConstraints.REMAINDER; //end row
+            //c.add(tabbedPane, c0);
+
+            c9.gridwidth = 1;
+            c9.gridheight = 10;
+            panelMethod.add(panel4, c9);
             tabbedPane.addTab("Methods", panelMethod);
         }
 
         if (hasSignals) {
-            panelSignal.add(panel5, BorderLayout.WEST);
-            panelSignal.add(panel6, BorderLayout.EAST);
+            //panelSignal.add(panel5, BorderLayout.WEST);
+            //panelSignal.add(panel6, BorderLayout.EAST);
+            c10.gridwidth = 1;
+            c10.gridheight = 10;
+            c10.weighty = 1.0;
+            c10.weightx = 1.0;
+            c10.fill = GridBagConstraints.HORIZONTAL;
+            panelSignal.add(panel5, c10);
+            c10.gridwidth = GridBagConstraints.REMAINDER; //end row
+            //c.add(tabbedPane, c0);
+
+            c10.gridwidth = 1;
+            c10.gridheight = 10;
+            panelSignal.add(panel6, c10);
+
             tabbedPane.addTab("Signals", panelSignal);
         }
 
@@ -589,18 +641,23 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         c0.weighty = 1.0;
         c0.weightx = 1.0;
         c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-        c.add(tabbedPane, c0);
+        //c.add(tabbedPane, c0);
 
         c0.gridwidth = 1;
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
-        
-        initButtons(c0, c, this);
+
+        JPanel panel4Buttons = new JPanel();
+        panel4Buttons.setLayout(gridbag0);
+        initButtons(c0, panel4Buttons, this);
+
+        c.add(tabbedPane, BorderLayout.CENTER);
+        c.add(panel4Buttons, BorderLayout.SOUTH);
     }
 
-    public void actionPerformed(ActionEvent evt)  {
+    public void actionPerformed(ActionEvent evt) {
         if (evt.getSource() == typeBox) {
-            boolean b = initValues.get (typeBox.getSelectedIndex()).booleanValue();
+            boolean b = initValues.get(typeBox.getSelectedIndex()).booleanValue();
             initialValue.setEnabled(b);
             return;
         }
@@ -609,7 +666,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         //String command = evt.getActionCommand();
 
         // Compare the action command to the known actions.
-        if (evt.getSource() == closeButton)  {
+        if (evt.getSource() == closeButton) {
             closeDialog();
         } else if (evt.getSource() == addButton) {
             addAttribute();
@@ -623,7 +680,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             upAttribute();
         } else if (evt.getSource() == upMethodButton) {
             upMethod();
-        }  else if (evt.getSource() == downMethodButton) {
+        } else if (evt.getSource() == downMethodButton) {
             downMethod();
         } else if (evt.getSource() == removeMethodButton) {
             removeMethod();
@@ -669,7 +726,6 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
     }
 
 
-
     public void addAttribute() {
         Object o1 = accessBox.getSelectedItem();
         Object o2 = typeBox.getSelectedItem();
@@ -677,8 +733,8 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         String value = initialValue.getText();
         TAttribute a;
 
-        if (s.length()>0) {
-            if ((TAttribute.isAValidId(s, checkKeyword, checkJavaKeyword)) && (TAttribute.notIn(s, forbidden))){
+        if (s.length() > 0) {
+            if ((TAttribute.isAValidId(s, checkKeyword, checkJavaKeyword)) && (TAttribute.notIn(s, forbidden))) {
                 int i = TAttribute.getAccess(o1.toString());
                 int j = TAttribute.getAvatarType(o2.toString());
 
@@ -686,17 +742,17 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
                     value = "2";
                 }
 
-                if ((i != -1) && (j!= -1)) {
+                if ((i != -1) && (j != -1)) {
 
-                    if ((value.length() < 1) || (initialValue.isEnabled() == false)){
+                    if ((value.length() < 1) || (initialValue.isEnabled() == false)) {
 
                         value = "";
                     } else {
                         if (!TAttribute.isAValidInitialValue(j, value)) {
                             JOptionPane.showMessageDialog(frame,
-                                                          "The initial value is not valid",
-                                                          "Error",
-                                                          JOptionPane.INFORMATION_MESSAGE);
+                                    "The initial value is not valid",
+                                    "Error",
+                                    JOptionPane.INFORMATION_MESSAGE);
                             return;
                         }
                     }
@@ -712,7 +768,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
                     int index = attributes.size();
                     if (attributes.contains(a)) {
                         index = attributes.indexOf(a);
-                        a = attributes.get (index);
+                        a = attributes.get(index);
                         a.setAccess(i);
                         if (j == TAttribute.OTHER) {
                             a.setTypeOther(o2.toString());
@@ -722,27 +778,27 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
                     } else {
                         attributes.add(index, a);
                     }
-                    listAttribute.setListData(attributes.toArray (new TAttribute[0]));
+                    listAttribute.setListData(attributes.toArray(new TAttribute[0]));
                     identifierText.setText("");
                 } else {
                     JOptionPane.showMessageDialog(frame,
-                                                  "Bad access / type",
-                                                  "Error",
-                                                  JOptionPane.INFORMATION_MESSAGE);
+                            "Bad access / type",
+                            "Error",
+                            JOptionPane.INFORMATION_MESSAGE);
                     return;
                 }
             } else {
                 JOptionPane.showMessageDialog(frame,
-                                              "Bad identifier: identifier already in use, or invalid identifier",
-                                              "Error",
-                                              JOptionPane.INFORMATION_MESSAGE);
+                        "Bad identifier: identifier already in use, or invalid identifier",
+                        "Error",
+                        JOptionPane.INFORMATION_MESSAGE);
                 return;
             }
         } else {
             JOptionPane.showMessageDialog(frame,
-                                          "Bad identifier",
-                                          "Error",
-                                          JOptionPane.INFORMATION_MESSAGE);
+                    "Bad identifier",
+                    "Error",
+                    JOptionPane.INFORMATION_MESSAGE);
             return;
         }
     }
@@ -759,7 +815,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
 
             // Checks whether the same method already belongs to the list
             int index = -1;
-            for(int i=0; i<methods.size(); i++) {
+            for (int i = 0; i < methods.size(); i++) {
                 amtmp = methods.get(i);
                 // Same id?
                 if (amtmp.equals(am)) {
@@ -770,17 +826,17 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             if (index == -1) {
                 methods.add(am);
             } else {
-                methods.remove (index);
+                methods.remove(index);
                 methods.add(index, am);
             }
-            listMethod.setListData(methods.toArray (new AvatarMethod[0]));
+            listMethod.setListData(methods.toArray(new AvatarMethod[0]));
             methodText.setText("");
 
         } else {
             JOptionPane.showMessageDialog(frame,
-                                          "Badly formatted method declaration",
-                                          "Error",
-                                          JOptionPane.INFORMATION_MESSAGE);
+                    "Badly formatted method declaration",
+                    "Error",
+                    JOptionPane.INFORMATION_MESSAGE);
             return;
         }
     }
@@ -794,7 +850,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         if (as != null) {
             // Checks whether the same signal already belongs to the list
             int index = -1;
-            for(int i=0; i<signals.size(); i++) {
+            for (int i = 0; i < signals.size(); i++) {
                 astmp = signals.get(i);
                 // Same id?
                 if (astmp.equals(as)) {
@@ -805,39 +861,39 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             if (index == -1) {
                 signals.add(as);
             } else {
-                signals.remove (index);
-                signals.add (index, as);
+                signals.remove(index);
+                signals.add(index, as);
             }
-            listSignal.setListData(signals.toArray (new AvatarSignal[0]));
+            listSignal.setListData(signals.toArray(new AvatarSignal[0]));
             signalText.setText("");
 
         } else {
             JOptionPane.showMessageDialog(frame,
-                                          "Badly formatted signal declaration",
-                                          "Error",
-                                          JOptionPane.INFORMATION_MESSAGE);
+                    "Badly formatted signal declaration",
+                    "Error",
+                    JOptionPane.INFORMATION_MESSAGE);
             return;
         }
     }
 
     public void removeAttribute() {
-        int i = listAttribute.getSelectedIndex() ;
-        if (i!= -1) {
-            TAttribute a = attributes.get (i);
+        int i = listAttribute.getSelectedIndex();
+        if (i != -1) {
+            TAttribute a = attributes.get(i);
             a.setAccess(-1);
-            attributes.remove (i);
-            listAttribute.setListData(attributes.toArray (new TAttribute[0]));
+            attributes.remove(i);
+            listAttribute.setListData(attributes.toArray(new TAttribute[0]));
         }
     }
 
     public void downAttribute() {
         int i = listAttribute.getSelectedIndex();
-        if ((i!= -1) && (i != attributes.size() - 1)) {
-            TAttribute o = attributes.get (i);
-            attributes.remove (i);
-            attributes.add (i+1, o);
-            listAttribute.setListData(attributes.toArray (new TAttribute[0]));
-            listAttribute.setSelectedIndex(i+1);
+        if ((i != -1) && (i != attributes.size() - 1)) {
+            TAttribute o = attributes.get(i);
+            attributes.remove(i);
+            attributes.add(i + 1, o);
+            listAttribute.setListData(attributes.toArray(new TAttribute[0]));
+            listAttribute.setSelectedIndex(i + 1);
         }
     }
 
@@ -846,19 +902,19 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         //TraceManager.addDev("Selected index = " + i);
         if (i > 0) {
             //TraceManager.addDev("Modifying ...");
-            TAttribute o = attributes.get (i);
-            attributes.remove (i);
-            attributes.add (i-1, o);
-            listAttribute.setListData(attributes.toArray (new TAttribute[0]));
-            listAttribute.setSelectedIndex(i-1);
+            TAttribute o = attributes.get(i);
+            attributes.remove(i);
+            attributes.add(i - 1, o);
+            listAttribute.setListData(attributes.toArray(new TAttribute[0]));
+            listAttribute.setSelectedIndex(i - 1);
         }
     }
 
     public void removeMethod() {
-        int i = listMethod.getSelectedIndex() ;
-        if (i!= -1) {
-            methods.remove (i);
-            listMethod.setListData(methods.toArray (new AvatarMethod [0]));
+        int i = listMethod.getSelectedIndex();
+        if (i != -1) {
+            methods.remove(i);
+            listMethod.setListData(methods.toArray(new AvatarMethod[0]));
         }
     }
 
@@ -866,71 +922,71 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
         int i = listMethod.getSelectedIndex();
         //TraceManager.addDev("Selected index method = " + i);
         if (i > 0) {
-            AvatarMethod o = methods.get (i);
-            methods.remove (i);
-            methods.add (i-1, o);
-            listMethod.setListData(methods.toArray (new AvatarMethod [0]));
-            listMethod.setSelectedIndex(i-1);
+            AvatarMethod o = methods.get(i);
+            methods.remove(i);
+            methods.add(i - 1, o);
+            listMethod.setListData(methods.toArray(new AvatarMethod[0]));
+            listMethod.setSelectedIndex(i - 1);
         }
     }
 
     public void downMethod() {
         int i = listMethod.getSelectedIndex();
-        if ((i!= -1) && (i != methods.size() - 1)) {
-            AvatarMethod o = methods.get (i);
-            methods.remove (i);
-            methods.add (i+1, o);
-            listMethod.setListData(methods.toArray (new AvatarMethod [0]));
-            listMethod.setSelectedIndex(i+1);
+        if ((i != -1) && (i != methods.size() - 1)) {
+            AvatarMethod o = methods.get(i);
+            methods.remove(i);
+            methods.add(i + 1, o);
+            listMethod.setListData(methods.toArray(new AvatarMethod[0]));
+            listMethod.setSelectedIndex(i + 1);
         }
     }
 
     public void removeSignal() {
-        int i = listSignal.getSelectedIndex() ;
-        if (i!= -1) {
-            signals.remove (i);
-            listSignal.setListData(signals.toArray (new AvatarSignal [0]));
+        int i = listSignal.getSelectedIndex();
+        if (i != -1) {
+            signals.remove(i);
+            listSignal.setListData(signals.toArray(new AvatarSignal[0]));
         }
     }
 
     public void upSignal() {
         int i = listSignal.getSelectedIndex();
         if (i > 0) {
-            AvatarSignal o = signals.get (i);
-            signals.remove (i);
-            signals.add (i-1, o);
-            listSignal.setListData(signals.toArray (new AvatarSignal [0]));
-            listSignal.setSelectedIndex(i-1);
+            AvatarSignal o = signals.get(i);
+            signals.remove(i);
+            signals.add(i - 1, o);
+            listSignal.setListData(signals.toArray(new AvatarSignal[0]));
+            listSignal.setSelectedIndex(i - 1);
         }
     }
 
     public void downSignal() {
         int i = listSignal.getSelectedIndex();
-        if ((i!= -1) && (i != signals.size() - 1)) {
-            AvatarSignal o = signals.get (i);
+        if ((i != -1) && (i != signals.size() - 1)) {
+            AvatarSignal o = signals.get(i);
             signals.remove(i);
-            signals.add (i+1, o);
-            listSignal.setListData(signals.toArray (new AvatarSignal [0]));
-            listSignal.setSelectedIndex(i+1);
+            signals.add(i + 1, o);
+            listSignal.setListData(signals.toArray(new AvatarSignal[0]));
+            listSignal.setSelectedIndex(i + 1);
         }
     }
 
 
     public void closeDialog() {
         cancelled = false;
-        attributesPar.clear ();
-        for(TAttribute attr: this.attributes)
-            attributesPar.add (attr);
+        attributesPar.clear();
+        for (TAttribute attr : this.attributes)
+            attributesPar.add(attr);
 
-        methodsPar.clear ();
-        for(AvatarMethod meth: this.methods)
-            methodsPar.add (meth);
+        methodsPar.clear();
+        for (AvatarMethod meth : this.methods)
+            methodsPar.add(meth);
 
-        signalsPar.clear ();
-        for(AvatarSignal sig: this.signals)
-            signalsPar.add (sig);
+        signalsPar.clear();
+        for (AvatarSignal sig : this.signals)
+            signalsPar.add(sig);
 
-        globalCode =  Conversion.wrapText(jtaGlobalCode.getText());
+        globalCode = Conversion.wrapText(jtaGlobalCode.getText());
         mainCode = jtaMainCode.getText();
         cancelled = false;
         dispose();
@@ -941,13 +997,12 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
     }
 
 
-
     public void cancelDialog() {
         dispose();
     }
 
     public void valueChanged(ListSelectionEvent e) {
-        int i = listAttribute.getSelectedIndex() ;
+        int i = listAttribute.getSelectedIndex();
         if (i == -1) {
             removeButton.setEnabled(false);
             upButton.setEnabled(false);
@@ -955,7 +1010,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             identifierText.setText("");
             //initialValue.setText("");
         } else {
-            TAttribute a = attributes.get (i);
+            TAttribute a = attributes.get(i);
             identifierText.setText(a.getId());
             initialValue.setText(a.getInitialValue());
             select(accessBox, TAttribute.getStringAccess(a.getAccess()));
@@ -977,7 +1032,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             }
         }
 
-        i = listMethod.getSelectedIndex() ;
+        i = listMethod.getSelectedIndex();
         if (i == -1) {
             removeMethodButton.setEnabled(false);
             upMethodButton.setEnabled(false);
@@ -985,7 +1040,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             methodText.setText("");
             //initialValue.setText("");
         } else {
-            AvatarMethod am = methods.get (i);
+            AvatarMethod am = methods.get(i);
             methodText.setText(am.toString());
             //TraceManager.addDev("Implementation of " + am + " is: " +  am.isImplementationProvided());
             implementationProvided.setSelected(am.isImplementationProvided());
@@ -1002,7 +1057,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             }
         }
 
-        i = listSignal.getSelectedIndex() ;
+        i = listSignal.getSelectedIndex();
         if (i == -1) {
             removeSignalButton.setEnabled(false);
             upSignalButton.setEnabled(false);
@@ -1010,7 +1065,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
             signalText.setText("");
             //initialValue.setText("");
         } else {
-            AvatarSignal as = signals.get (i);
+            AvatarSignal as = signals.get(i);
             signalText.setText(as.toBasicString());
             signalInOutBox.setSelectedIndex(as.getInOut());
             removeSignalButton.setEnabled(true);
@@ -1029,7 +1084,7 @@ public class JDialogAvatarBlock extends JDialogBase implements ActionListener, L
 
     public void select(JComboBox<String> jcb, String text) {
         String s;
-        for(int i=0; i<jcb.getItemCount(); i++) {
+        for (int i = 0; i < jcb.getItemCount(); i++) {
             s = jcb.getItemAt(i);
             //System.out.println("String found: *" + s + "* *" + text + "*");
             if (s.equals(text)) {
diff --git a/src/main/java/ui/window/JDialogBase.java b/src/main/java/ui/window/JDialogBase.java
index 7d669bc0523f118a7b8797afecf41b41ae341c0c..2d39b04d287c20e830c82a10c4b1b33290c03992 100644
--- a/src/main/java/ui/window/JDialogBase.java
+++ b/src/main/java/ui/window/JDialogBase.java
@@ -62,6 +62,8 @@ public class JDialogBase extends JDialog {
         this.getRootPane().setDefaultButton(closeButton);
 	}
 
+
+
 	protected void initButtons(Container c,
 							   ActionListener al) {
 
diff --git a/src/main/java/ui/window/JDialogPragma.java b/src/main/java/ui/window/JDialogPragma.java
index 9460a2d0d9dafbe186dbf7f6f344d1bbb0b0f250..6127890ef51539367aaef8de3a06bd1082a45180 100755
--- a/src/main/java/ui/window/JDialogPragma.java
+++ b/src/main/java/ui/window/JDialogPragma.java
@@ -37,8 +37,6 @@
  */
 
 
-
-
 package ui.window;
 
 import ui.util.IconManager;
@@ -56,34 +54,38 @@ import java.util.regex.Pattern;
  * Class JDialogPragma
  * Dialog for entering a note
  * Creation: 06/12/2003
- * @version 1.0 06/12/2003
+ *
  * @author Ludovic APVRILLE, Letitia LI
+ * @version 1.0 06/12/2003
  */
 public class JDialogPragma extends JDialogBase implements ActionListener {
-    
+
     protected String text;
-    
+
     //components
     private JTextArea textarea;
     protected JButton close;
     protected JButton cancel;
     protected JMenu help;
     private JPopupMenu helpPopup;
-	public HashMap<String, java.util.List<String>> blockAttributeMap = new HashMap<>();
-	public HashMap<String, java.util.List<String>> blockStateMap = new HashMap<>();
-    /** Creates new form  */
+    public HashMap<String, java.util.List<String>> blockAttributeMap = new HashMap<>();
+    public HashMap<String, java.util.List<String>> blockStateMap = new HashMap<>();
+
+    /**
+     * Creates new form
+     */
     public JDialogPragma(Frame f, String title, String _text) {
         super(f, title, true);
         text = _text;
-        
+
         initComponents();
         pack();
     }
 //Suggestion Panel code from: http://stackoverflow.com/questions/10873748/how-to-show-autocomplete-as-i-type-in-jtextarea
 
     public class SuggestionPanel {
-		private final String[] pragma = {"#Authenticity", "#Confidentiality", "#PublicConstant", "#PrivateConstant", "#InitialSessionKnowledge", "#InitialSystemKnowledge", "#PrivatePublicKeys", "#Public", "#SecrecyAssumption", "#Secret"};
-		private JList list;
+        private final String[] pragma = {"#Authenticity", "#Confidentiality", "#PublicConstant", "#PrivateConstant", "#InitialSessionKnowledge", "#InitialSystemKnowledge", "#PrivatePublicKeys", "#Public", "#SecrecyAssumption", "#Secret"};
+        private JList list;
         private JPopupMenu popupMenu;
         private String subWord;
         private final int insertionPosition;
@@ -96,10 +98,10 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
             popupMenu.setOpaque(false);
             popupMenu.setBorder(null);
             popupMenu.add(list = createSuggestionList(position, subWord, header), BorderLayout.CENTER);
-	    	//Show popupMenu only if there are matching suggestions
-	    	if (list.getModel().getSize() >0){
+            //Show popupMenu only if there are matching suggestions
+            if (list.getModel().getSize() > 0) {
                 popupMenu.show(textarea, location.x, textarea.getBaseline(0, 0) + location.y);
-	    	}
+            }
         }
 
         public void hide() {
@@ -109,62 +111,58 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
             }
         }
 
-		private JList createSuggestionList(final int position, final String subWord, String header) {
-			ArrayList<String> matches = new ArrayList<>();
-	    	if (subWord.startsWith("#")){
-	    	    for (String p: pragma) {
-        	  	    if (p.startsWith(subWord)){
-						matches.add(p);
-				    }
-				}
-			}
-			else if (header.contains("#")){
-				//Find instances of '.'
-				Pattern p = Pattern.compile("\\.");
-				Matcher m = p.matcher(subWord);
-				int count = 0;
-				while (m.find()){
-				    count +=1;
-				}
-				if (count==0){
-					//Suggest block names
-					for (String block: blockAttributeMap.keySet()){
-						if (block.startsWith(subWord)){
-							matches.add(block);
-						}
-					}
-				}
-				else if (count==1){
-					if (header.contains("Authenticity")){
-						//Suggest state names
-						String block = subWord.split("\\.")[0];
-						for (String st: blockStateMap.get(block)){
-							if (st.startsWith(subWord.split("\\.")[1])){
-								matches.add(block+"."+st);
-							}
-						}
-					}
-					else {					
-						String block = subWord.split("\\.")[0];
-						for (String attr: blockAttributeMap.get(block)){
-							if (attr.startsWith(subWord.split("\\.")[1])){
-								matches.add(block+"."+attr);
-							}
-						}
-					}
-				}
-				else {
-					String block = subWord.split("\\.")[0];
-					String state = subWord.split("\\.")[1];
-					for (String attr: blockAttributeMap.get(block)){
-						if (attr.startsWith(subWord.split("\\.")[2])){
-							matches.add(block+"."+state+"."+attr);
-						}
-					}
-				
-				}
-			}
-		    String[] data = new String[matches.size()];
+        private JList createSuggestionList(final int position, final String subWord, String header) {
+            ArrayList<String> matches = new ArrayList<>();
+            if (subWord.startsWith("#")) {
+                for (String p : pragma) {
+                    if (p.startsWith(subWord)) {
+                        matches.add(p);
+                    }
+                }
+            } else if (header.contains("#")) {
+                //Find instances of '.'
+                Pattern p = Pattern.compile("\\.");
+                Matcher m = p.matcher(subWord);
+                int count = 0;
+                while (m.find()) {
+                    count += 1;
+                }
+                if (count == 0) {
+                    //Suggest block names
+                    for (String block : blockAttributeMap.keySet()) {
+                        if (block.startsWith(subWord)) {
+                            matches.add(block);
+                        }
+                    }
+                } else if (count == 1) {
+                    if (header.contains("Authenticity")) {
+                        //Suggest state names
+                        String block = subWord.split("\\.")[0];
+                        for (String st : blockStateMap.get(block)) {
+                            if (st.startsWith(subWord.split("\\.")[1])) {
+                                matches.add(block + "." + st);
+                            }
+                        }
+                    } else {
+                        String block = subWord.split("\\.")[0];
+                        for (String attr : blockAttributeMap.get(block)) {
+                            if (attr.startsWith(subWord.split("\\.")[1])) {
+                                matches.add(block + "." + attr);
+                            }
+                        }
+                    }
+                } else {
+                    String block = subWord.split("\\.")[0];
+                    String state = subWord.split("\\.")[1];
+                    for (String attr : blockAttributeMap.get(block)) {
+                        if (attr.startsWith(subWord.split("\\.")[2])) {
+                            matches.add(block + "." + state + "." + attr);
+                        }
+                    }
+
+                }
+            }
+            String[] data = new String[matches.size()];
             data = matches.toArray(data);
             JList<String> list = new JList<>(data);
             list.setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY, 1));
@@ -178,15 +176,15 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
                     }
                 }
             });
-	    
+
             return list;
         }
 
-	
+
         public boolean insertSelection() {
-	    if (!popupMenu.isVisible()){
-		return false;
-	    }
+            if (!popupMenu.isVisible()) {
+                return false;
+            }
             if (list.getSelectedValue() != null) {
                 try {
                     final String selectedSuggestion = ((String) list.getSelectedValue()).substring(subWord.length());
@@ -221,8 +219,10 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
             });
         }
     }
-     private SuggestionPanel suggestion;
-     protected void showSuggestionLater() {
+
+    private SuggestionPanel suggestion;
+
+    protected void showSuggestionLater() {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
@@ -259,24 +259,22 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
         if (subWord.length() < 1) {
             return;
         }
-		String header;
-		//Find the most recent pragma name
-		start=Math.max(0,position-1);
-		while (start>0){
-			//Find previous new line position
-			if (!String.valueOf(text.charAt(start)).matches(".")){
-				break;
-			}
-			else {
-				start--;
-			}
-		}
-		if (start==0){
-			header = text.substring(start, position).split(" ")[0];
-		}
-		else {
-			header = text.substring(start+1,position).split(" ")[0];
-		}
+        String header;
+        //Find the most recent pragma name
+        start = Math.max(0, position - 1);
+        while (start > 0) {
+            //Find previous new line position
+            if (!String.valueOf(text.charAt(start)).matches(".")) {
+                break;
+            } else {
+                start--;
+            }
+        }
+        if (start == 0) {
+            header = text.substring(start, position).split(" ")[0];
+        } else {
+            header = text.substring(start + 1, position).split(" ")[0];
+        }
         suggestion = new SuggestionPanel(textarea, position, subWord, location, header);
         SwingUtilities.invokeLater(new Runnable() {
             @Override
@@ -293,15 +291,15 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
     }
 
     protected void initComponents() {
-        
+
         Container c = getContentPane();
         Font f = new Font("Helvetica", Font.PLAIN, 14);
         setFont(f);
         c.setLayout(new BorderLayout());
         //setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);	
         helpPopup = new JPopupMenu();
-	JTextArea jft = new JTextArea("Pragma Guidelines: \n #Authenticity: Compare if two Attributes are equal at given states \n #Confidentiality: Query whether the attacker knows the value of this attribute. \n #PublicConstant: Declare string as public constant \n #PrivateConstant: Declare string as private constant \n #InitialSessionKnowledge: Knowledge at the start of each session\n #InitialSystemKnowledge: Knowledge at the start of the system \n #PrivatePublicKeys: Set two attribute of a block as Private and Public Key respectively \n #Public: Declare variable public \n #SecrecyAssumption: Assume attribute confidential, but query to verify \n #Secret: See #Confidentiality");
-	helpPopup.add(jft);
+        JTextArea jft = new JTextArea("Pragma Guidelines: \n #Authenticity: Compare if two Attributes are equal at given states \n #Confidentiality: Query whether the attacker knows the value of this attribute. \n #PublicConstant: Declare string as public constant \n #PrivateConstant: Declare string as private constant \n #InitialSessionKnowledge: Knowledge at the start of each session\n #InitialSystemKnowledge: Knowledge at the start of the system \n #PrivatePublicKeys: Set two attribute of a block as Private and Public Key respectively \n #Public: Declare variable public \n #SecrecyAssumption: Assume attribute confidential, but query to verify \n #Secret: See #Confidentiality");
+        helpPopup.add(jft);
         textarea = new JTextArea();
 
         textarea.setEditable(true);
@@ -309,12 +307,12 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
         textarea.setTabSize(3);
         textarea.append(text);
         textarea.setFont(new Font("times", Font.PLAIN, 12));
-	JMenuBar menuBar = new JMenuBar();
-	menuBar.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
-	help = new JMenu("?");
-	menuBar.add(help);
-	setJMenuBar(menuBar);
-	textarea.addKeyListener(new KeyListener() {
+        JMenuBar menuBar = new JMenuBar();
+        menuBar.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        help = new JMenu("?");
+        menuBar.add(help);
+        setJMenuBar(menuBar);
+        textarea.addKeyListener(new KeyListener() {
             @Override
             public void keyTyped(KeyEvent e) {
                 if (e.getKeyChar() == KeyEvent.VK_ENTER || e.getKeyChar() == KeyEvent.VK_TAB) {
@@ -345,85 +343,83 @@ public class JDialogPragma extends JDialogBase implements ActionListener {
                     suggestion.moveUp();
                 } else if (Character.isWhitespace(e.getKeyChar())) {
                     hideSuggestion();
-                }
-		else if (Character.isLetter(e.getKeyChar()) || e.getKeyChar()=='#'){
+                } else if (Character.isLetter(e.getKeyChar()) || e.getKeyChar() == '#') {
                     showSuggestionLater();
                 }
             }
 
             @Override
             public void keyPressed(KeyEvent e) {
-		if (e.getKeyCode() == KeyEvent.VK_DOWN && suggestion != null) {
-                   e.consume();
+                if (e.getKeyCode() == KeyEvent.VK_DOWN && suggestion != null) {
+                    e.consume();
                 } else if (e.getKeyCode() == KeyEvent.VK_UP && suggestion != null) {
                     e.consume();
-                } 
+                }
             }
         });
 
 
-	
         JScrollPane jsp = new JScrollPane(textarea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
         jsp.setPreferredSize(new Dimension(300, 300));
         c.add(jsp, BorderLayout.CENTER);
-        
 
 
         close = new JButton("Ok", IconManager.imgic25);
         cancel = new JButton("Cancel", IconManager.imgic27);
-        
-	help.setPreferredSize(new Dimension(30,30));
+
+        help.setPreferredSize(new Dimension(30, 30));
 
         close.setPreferredSize(new Dimension(150, 30));
         cancel.setPreferredSize(new Dimension(150, 30));
-        
+
         close.addActionListener(this);
         cancel.addActionListener(this);
         help.addMouseListener(new MouseAdapter() {
-                @Override
-                public void mousePressed(MouseEvent e) {
-                    help();
-                }
-            });
+            @Override
+            public void mousePressed(MouseEvent e) {
+                help();
+            }
+        });
         JPanel jp = new JPanel();
         jp.add(close);
         jp.add(cancel);
-        
+
         c.add(jp, BorderLayout.SOUTH);
-	
+
     }
-    
-    public void	actionPerformed(ActionEvent evt)  {
+
+    public void actionPerformed(ActionEvent evt) {
         String command = evt.getActionCommand();
-        
+
         // Compare the action command to the known actions.
-        if (command.equals("Cancel"))  {
+        if (command.equals("Cancel")) {
             cancel();
         } else if (command.equals("Ok")) {
             close();
         }
-	
+
     }
-    
+
     public void cancel() {
         dispose();
     }
-    
+
     public void close() {
         text = textarea.getText();
         dispose();
     }
-    public void help(){
-	if (!helpPopup.isVisible()){
-	    helpPopup.show(help, 20, 20);
-	}
-	else {
-	    helpPopup.setVisible(false);
-	}
+
+    public void help() {
+        if (!helpPopup.isVisible()) {
+            helpPopup.show(help, 20, 20);
+        } else {
+            helpPopup.setVisible(false);
+        }
     }
+
     public String getText() {
         return text;
     }
-    
-    
+
+
 }
diff --git a/src/main/java/ui/window/JDialogSignalAssociation.java b/src/main/java/ui/window/JDialogSignalAssociation.java
index cd79fca7de6351aa0f15d80df10e69c0fd65605f..084e1046c1c41e2b63e128c69b64dd8f05b436a8 100644
--- a/src/main/java/ui/window/JDialogSignalAssociation.java
+++ b/src/main/java/ui/window/JDialogSignalAssociation.java
@@ -140,12 +140,12 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
 
         panel1 = new JPanel();
         panel1.setLayout(gridbag1);
-        panel1.setBorder(new javax.swing.border.TitledBorder("Adding signals"));
+        panel1.setBorder(new javax.swing.border.TitledBorder("Connecting signals"));
         panel1.setMinimumSize(new Dimension(325, 250));
 
         panel2 = new JPanel();
         panel2.setLayout(gridbag2);
-        panel2.setBorder(new javax.swing.border.TitledBorder("Managing Signals"));
+        panel2.setBorder(new javax.swing.border.TitledBorder("Connected signals"));
         panel2.setMinimumSize(new Dimension(325, 250));
 
         panel3 = new JPanel();
@@ -197,7 +197,7 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         // fourth line panel1
         c1.gridheight = 1;
         c1.fill = GridBagConstraints.HORIZONTAL;
-        addButton = new JButton("Add Signals");
+        addButton = new JButton("Connect Signals");
         addButton.addActionListener(this);
         panel1.add(addButton, c1);
 
@@ -232,7 +232,7 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         downButton.addActionListener(this);
         panel2.add(downButton, c2);
 
-        removeButton = new JButton("Remove signals");
+        removeButton = new JButton("Remove connected signals");
         removeButton.addActionListener(this);
         panel2.add(removeButton, c2);
 
@@ -243,6 +243,7 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         c3.weighty = 1;
         c3.weightx = 10.0;
         synchronous = new JRadioButton("synchronous");
+        synchronous.setToolTipText("The sender and receiver must synchronize to exchange a message");
         synchronous.addActionListener(this);
         panel3.add(synchronous, c3);
         isBroadcast = new JCheckBox("Broadcast channel");
@@ -250,6 +251,7 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         panel3.add(isBroadcast, c3);
 
         asynchronous = new JRadioButton("asynchronous");
+        asynchronous.setToolTipText("FIFO-based communication");
         asynchronous.addActionListener(this);
         panel3.add(asynchronous, c3);
         ButtonGroup bt = new ButtonGroup();
@@ -258,6 +260,7 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         asynchronous.setSelected(connector.isAsynchronous());
         synchronous.setSelected(!connector.isAsynchronous());
         isLossy = new JCheckBox("Lossy channel");
+        isLossy.setToolTipText("A lossy channel randomly losses messages");
         isLossy.setSelected(connector.isLossy());
         panel3.add(isLossy, c3);
 
@@ -269,6 +272,7 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         panel3.add(sizeOfFIFO, c3);
 
         blocking = new JCheckBox("Blocking on write when FIFO is full");
+        blocking.setToolTipText("With a non blocking channel, write(m) in a full FIFO losses m");
         blocking.setSelected(connector.isBlocking());
         panel3.add(blocking, c3);
 
@@ -280,7 +284,8 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         c4.weightx = 10.0;
         //panel3.add(new JLabel(" "), c3);
 
-        isPrivate = new JCheckBox("Private channel (an attacker cannot listen to it)");
+        isPrivate = new JCheckBox("Private channel");
+        isPrivate.setToolTipText("An attacker cannot spy messages on private channels");
         isPrivate.setSelected(connector.isPrivate());
         panel4.add(isPrivate, c4);