diff --git a/UltimaBomba/lub.html b/UltimaBomba/lub.html
index cc665bd380..fd844c3b7a 100644
--- a/UltimaBomba/lub.html
+++ b/UltimaBomba/lub.html
@@ -336,29 +336,55 @@
                             <b class='b' style='width: 100%;'>Arma</b> <br>
                             <input type=text name=attr_weaponname style='width: 100%;'>
                         </div>
-                        <div class='col' style='width: 10%;'>
-                            <b class='b' style=' width: 100%;'>Tiro</b><br>
-                            <input type=text name=attr_weapontiro style='width: 100%;'>
-                        </div>
                         <div class='col' style='width: 5%;'>
-                            <b class='b' style=' width: 100%;'>Mod</b><br>
-                            <input type=text name=attr_attackbonus style='width: 100%;'>
-                        </div>
-                        <div class='col' style='width: 5%;' align=center>
-                            <b class='b' style=' width: 100%;'>Roll</b><br>
-                            <button type=roll
-                                value="&{template:default} {{name=@{weaponname}}} {{Roll:= [[@{weapontiro}kh1@{attackbonus}]]}} {{damage= [[@{weapondamage}kh1@{attackbonus}]]}}"></button>
-                        </div>
-                        <div class='col' style='width: 10%;'>
                             <b class='b' style=' width: 100%;'>Danno</b><br>
                             <input type=text name=attr_weapondamage style='width: 100%;'>
                         </div>
+                        <div class='col' style='width: 5%;'>
+                            <b class='b' style=' width: 100%;'>Mod</b><br>
+                            <input type=number name=attr_damagebonus style='width: 100%;'>
+                        </div>
+                        <div class='col' style='width: 5%;'>
+                                <b class='b' style='width: 100%;'>Extra</b><br>
+                                <input type=text name=attr_weaponextradamage style='width: 100%;'>
+                            </div>
                         <div class='col' style='width: 5%;'>
                             <b class='b' style=' width: 100%;'>Roll</b><br>
                             <button type=roll
-                                value="&{template:default} {{name=@{weaponname}}} {{damage= [[@{weapondamage}kh1@{attackbonus}]]}}"></button>
+                                value="&{template:default} {{name=@{weaponname}}} {{damage= [[@{weapondamage}@{weaponextradamage}kh1+@{damagebonus}]]}}"></button>
                         </div>
                         <div class='col' style='width: 10%;'>
+                            <b class='b' style='width: 100%;'>Cal</b><br>
+                            <input type=text name=attr_weaponcal style='width: 100%;'>
+                        </div>
+                        <div class='col' style='width: 8%;'>
+                            <b class='b' style='width: 100%;'>Munizioni</b><br>
+                            <input type=text name=attr_weaponammo style='width: 100%;'>
+                        </div>
+                        <div class='col' style='width: 32%;'>
+                            <b class='b' style='width: 100%;'>Note</b><br>
+                            <input type=text name=attr_weaponnote style='width: 100%;'>
+                        </div>
+                    </div>
+                    <div class='row' style='width: 100%;'>
+                        <div class='col' style='width: 5%;'>
+                                <b class='b' style=' width: 100%;'>Tiro</b><br>
+                                <input type=text name=attr_weapontiro style='width: 100%;'>
+                        </div>
+                        <div class='col' style='width: 5%;'>
+                            <b class='b' style=' width: 100%;'>Mod</b><br>
+                            <input type=number name=attr_attackbonus style='width: 100%;'>
+                        </div>
+                        <div class='col' style='width: 5%;'>
+                                <b class='b' style='width: 100%;'>Extra</b><br>
+                                <input type=text name=attr_weaponextraroll style='width: 100%;'>
+                            </div>
+                        <div class='col' style='width: 5%;' align=center>
+                            <b class='b' style=' width: 100%;'>Roll</b><br>
+                            <button type=roll
+                                value="&{template:default} {{name=@{weaponname}}} {{Roll:= [[@{weapontiro}@{weaponextraroll}kh1+@{attackbonus}]]}} {{damage= [[@{weapondamage}@{weaponextradamage}kh1+@{damagebonus}]] }}"></button>
+                        </div>
+                        <div class='col' style='width: 5%;'>
                             <b class='b' style='width: 100%;'>Incep</b><br>
                             <input type=text name=attr_weaponincep style='width: 100%;'>
                         </div>
@@ -367,35 +393,25 @@
                             <button type=roll
                                 value="&{template:default} {{name=Inceppamento}} {{Roll:= [[@{weaponincep}]]}}"></button>
                         </div>
-                        <div class='col' style='width: 10%;'>
-                            <b class='b' style='width: 100%;'>Cal</b><br>
-                            <input type=text name=attr_weaponcal style='width: 100%;'>
-                        </div>
-                        <div class='col' style='width: 10%;'>
-                            <b class='b' style='width: 100%;'>Munizioni</b><br>
-                            <input type=text name=attr_weaponammo style='width: 100%;'>
-                        </div>
-                    </div>
-                    <div class='row' style='width: 100%;'>
-                        <div class='col' style='width: 20%;' align=center>
-                            <b class='b' style=' width: 100%;'>Semi-automatico</b><br>
-                            <button type=roll
-                                value="&{template:default} {{name=@{weaponname} - SemiAutomatico}} {{Roll:= [[@{weapontiro}kh1ro>9@{attackbonus}]]}} {{damage= [[@{weapondamage}kh1@{attackbonus}]]}}"></button>
-                        </div>
-
-                        <div class='col' style='width: 10%;' align=center>
-                            <b class='b' style=' width: 100%;'>HeadShot</b><br>
-                            <button type=roll
-                                value="&{template:default} {{name=@{weaponname} - HEADSHOT}} {{damage= [[D10]]}}"></button>
-                        </div>
-                        <div class='col' style='width: 25%;' align=center>
-                            <b class='b' style=' width: 100%;'>N° Max di colpi messi a segno</b><br>
-                            <button type=roll
-                                value="&{template:default} {{name=N° Massimo di colpi messi a segno}} {{Roll:= [[D4+@{MANbonus}]]}}"></button>
-                        </div>
-                        <div class='col' style='width: 35%;'>
+                            <div class='col' style='width: 13%;' align=center>
+                                <b class='b' style=' width: 100%;'>Semi-automatico</b><br>
+                                <button type=roll
+                                value="&{template:default} {{name=@{weaponname} - SemiAutomatico}}  {{Roll:= [[@{weapontiro}@{weaponextraroll}kh1+@{attackbonus}]] [[@{weapontiro}@{weaponextraroll}kh1+@{attackbonus}]]}} {{damage= [[@{weapondamage}@{weaponextradamage}kh1+@{damagebonus}]] [[@{weapondamage}@{weaponextradamage}kh1+@{damagebonus}]] }}"></button>
+                            </div>
+                            <div class='col' style='width: 7%;' align=center>
+                                <b class='b' style=' width: 100%;'>HeadShot</b><br>
+                                <button type=roll
+                                    value="&{template:default} {{name=@{weaponname} - HEADSHOT}} {{damage= [[D10]]}}"></button>
+                            </div>
+                            <div class='col' style='width: 12%;' align=center>
+                                <b class='b' style=' width: 100%;'>Max colpi</b><br>
+                                <button type=roll
+                                    value="&{template:default} {{name=N° Massimo di colpi messi a segno}} {{Roll:= [[D4+@{MANbonus}]]}}"></button>
+                            </div>
+                            <div class='col' style='width: 32%;'>
                             <b class='b' style='width: 100%;'>Note</b><br>
-                            <input type=text name=attr_weaponnote style='width: 100%;'>
+                            <input type=text name=attr_weaponnote2 style='width: 100%;'>
+                        </div>
                         </div>
                     </div>
                 </div>