diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index b253780cf2..efc270813b 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css	
@@ -464,11 +464,11 @@ input[type='radio'].tab-switch {
 .pc div.repeating-container div.repitem, .pc div.repeating-container div.repitem input[type='text'], .pc div.repeating-container div.repitem input[type='number'], .pc div.skill-box label > input, .pc div.skill-box input[name='attr_skill'], .pc div.matrix div.programs div.repitem, .pc div.matrix div.devices div.repitem {
   border-bottom: 1px solid #333 !important; }
 
-.center {
+.center, sheet-center {
   text-align: center !important; }
-.left {
+.left, sheet-left {
   text-align: left !important; }
-.right {
+.right, sheet-right {
   text-align: right !important; }
 
 select.attribute-select option:nth-of-type(1n+5) {
@@ -5136,6 +5136,40 @@ div.footer img {
   font-family: 'helvetica' !important;
   padding: 5px 5px 3px 5px !important; }
 
+
+.sheet-rolltemplate-rolls-computed .sheet-template-row.sheet-tip {
+  line-height: .6em !important; 
+  text-align: right !important;}
+.sheet-rolltemplate-rolls-computed .sheet-template-row .sheet-tip {
+  font-size: .6em !important;
+  line-height: 1.25em !important; }
+
+.sheet-rolltemplate-rolls-computed div.sheet-template-row div.sheet-weapon-info-row1 {
+  font-size: 1em !important;
+  line-height: 1.25em !important;
+  font-weight: bold;
+  display: grid;
+  grid-column-gap: 1px;
+  grid-template-columns: 2fr 1.5fr 2fr;
+}
+.sheet-rolltemplate-rolls-computed div.sheet-template-row div.sheet-weapon-info-row2 {
+  font-size: 1em !important;
+  line-height: 1.25em !important;
+  font-weight: bold;
+  display: grid;
+  grid-column-gap: 1px;
+  grid-template-columns: 3.5fr;
+}
+.sheet-rolltemplate-rolls-computed div.sheet-template-row div.sheet-weapon-info-row3 {
+  font-size: 1em !important;
+  line-height: 1.25em !important;
+  font-weight: bold;
+  display: grid;
+  grid-column-gap: 1px;
+  grid-template-columns: 1fr 1fr 1fr;
+}
+
+
 .sheet-rolltemplate-multirow .sheet-template-row:nth-child(2n+0),
 .sheet-rolltemplate-quality .sheet-template-row:nth-child(2n+0),
 .sheet-rolltemplate-rolls .sheet-template-row:nth-child(2n+0),
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 491c951ded..5b9d1aaf01 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -871,6 +871,7 @@
 				<input type="hidden" name="attr_primary_range_weapon_base_medium" value="0" />
 				<input type="hidden" name="attr_primary_range_weapon_base_far" value="0" />
 				<input type="hidden" name="attr_primary_range_weapon_base_extreme" value="0" />
+				<input type="hidden" name="attr_primary_range_weapon_notes" value="" />
 				<select id="attr_primary_range_weapon_mode" name="attr_primary_range_weapon_mode" title="@{primary_range_weapon_mode}">
 					<option data-i18n="singleshot" value="Single Shot">Single Shot</option>
 					<option data-i18n="semiauto" value="Semi Auto">Semi-Auto</option>
@@ -5881,12 +5882,49 @@
 		</div>
 		{{/rollGreater() fade 0}}{{/fade}}
 
+		<div class="sheet-template-row">
+			<div class="sheet-weapon-info-row1">
+				<span class="sheet-tip sheet-dv">
+					<span title="Damage Value (DV)">{{damage}}</span>
+				</span>
+				<span class="sheet-tip sheet-firingmode">
+					<span title="Firing Mode">{{firingmode}}</span>
+				</span>
+				<span class="sheet-tip sheet-ammotype">
+					<span title="Ammo Type">{{ammotype}}</span>
+				</span>
+			</div>
+			<div class="sheet-weapon-info-row2">
+				<span class="sheet-tip sheet-attackratings">
+					<span title="0-3m">{{arclose}}</span> / <span title="4-50m">{{arnear}}</span> / <span title="51-250m">{{armedium}}</span> / <span title="251-500m">{{arfar}}</span> / <span title="500+m">{{arextreme}}</span>
+				</span>
+			</div>
+			<div class="sheet-weapon-info-row3">
+				<span class="sheet-tip sheet-skill">
+					<span title="Skill">{{skill}}</span>
+				</span>
+				<span class="sheet-tip sheet-attribute">
+					<span title="Attribute">{{attribute}}</span>
+				</span>
+				<span class="sheet-tip sheet-spec">
+					{{#rollGreater() spec 0}}<span title="">Specialized</span>{{/rollGreater() spec 0}}
+					{{#rollGreater() expert 0}}<span title="">Expertise</span>{{/rollGreater() expert 0}}
+				</span>
+			</div>
+		</div>
+
 		{{#desc}}
 		<div class="sheet-template-row">
 			<span class="sheet-template-desc">{{desc}}</span>
 		</div>
 		{{/desc}}
 
+		{{#tip}}
+		<div class="sheet-template-row sheet-tip">
+			<span class="sheet-tip">{{tip}}</span>
+		</div>
+		{{/tip}}
+
 		{{#extendedtest}}
 		<div class="sheet-template-row">
 			{{#rollGreater() computed::dicepool 1}}
@@ -6068,7 +6106,7 @@
 <input type="hidden" name="attr_wild_die1" value="0" />
 <input type="hidden" name="attr_wild_die2" value="0" />
 
-<input type="hidden" name="attr_sheet_version" value="0.70">
+<input type="hidden" name="attr_sheet_version" value="0.71">
 <input type="hidden" name="attr_data_version" value="0">
 <script type="text/worker">
 // Sheet workers
@@ -6625,7 +6663,8 @@ const rollButtons = {
 	soak_biofeedback: "@{gm_toggle} &{template:rolls-computed}{{header=@{character_name}}}{{base=^{biofeedback} ^{soak} = ^{willpower}}}{{dice=[[((@{willpower})+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifiers_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{desc=}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
 
 	primary_melee_weapon: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=@{primary_melee_weapon_name}}}{{dice=[[(@{primary_melee_weapon_rating}+@{primary_melee_weapon_attr_rating}+@{primary_melee_weapon_spec}+@{primary_melee_weapon_expert}+@{primary_melee_weapon_dicepool_modifier}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=Damage @{primary_melee_weapon_damage}, Skill: @{primary_melee_weapon_skill}, Attribute: @{primary_melee_weapon_attribute}}}{{wilddie=[[@{wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
-	primary_range_weapon: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=@{primary_range_weapon}}}{{dice=[[(@{primary_range_weapon_rating}+@{primary_range_weapon_attr_rating}+@{primary_range_weapon_spec}+@{primary_range_weapon_expert}+@{primary_range_weapon_dicepool_mod}+@{primary_range_weapon_dicepool_modifier}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=Mode: @{primary_range_weapon_mode}, Damage: @{primary_range_weapon_damage}, Ammo: @{primary_range_weapon_ammo_type}, Skill: @{primary_range_weapon_skill}, Attribute: @{primary_range_weapon_attribute}}}{{wilddie=[[@{wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
+	primary_range_weapon: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=@{primary_range_weapon}}}{{dice=[[(@{primary_range_weapon_rating}+@{primary_range_weapon_attr_rating}+@{primary_range_weapon_spec}+@{primary_range_weapon_expert}+@{primary_range_weapon_dicepool_mod}+@{primary_range_weapon_dicepool_modifier}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=@{primary_range_weapon_notes}}}{{wilddie=[[@{wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{tip=**Next:** Target rolls Defense}}{{arclose=@{primary_range_weapon_close}}}{{arnear=@{primary_range_weapon_near}}}{{armedium=@{primary_range_weapon_medium}}}{{arfar=@{primary_range_weapon_far}}}{{arextreme=@{primary_range_weapon_extreme}}}{{firingmode=@{primary_range_weapon_mode}}}{{damage=@{primary_range_weapon_damage}}}{{ammotype=@{primary_range_weapon_ammo_type}}}{{skill=@{primary_range_weapon_skill}}}{{attribute=@{primary_range_weapon_attribute}}}{{spec=[[@{primary_range_weapon_spec}]]}}{{expert=[[@{primary_range_weapon_expert}]]}}",
+//	primary_range_weapon: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=@{primary_range_weapon}}}{{dice=[[(@{primary_range_weapon_rating}+@{primary_range_weapon_attr_rating}+@{primary_range_weapon_spec}+@{primary_range_weapon_expert}+@{primary_range_weapon_dicepool_mod}+@{primary_range_weapon_dicepool_modifier}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=Mode: @{primary_range_weapon_mode}, Damage: @{primary_range_weapon_damage}, Ammo: @{primary_range_weapon_ammo_type}, Skill: @{primary_range_weapon_skill}, Attribute: @{primary_range_weapon_attribute}}}{{wilddie=[[@{wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{tip=**Next:** Target rolls Defense}}{{arclose=@{primary_range_weapon_close}}}{{arnear=@{primary_range_weapon_near}}}{{armedium=@{primary_range_weapon_medium}}}{{arfar=@{primary_range_weapon_far}}}{{arextreme=@{primary_range_weapon_extreme}}}",
 	primary_range_weapon_split_pool_2: "@{gm_toggle} &{template:rolls-computed}{{roll1=[[[[ceil((@{primary_range_weapon_rating}+@{primary_range_weapon_attr_rating}+@{primary_range_weapon_spec}+@{primary_range_weapon_expert}+@{primary_range_weapon_dicepool_mod}+@{primary_range_weapon_dicepool_modifier}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})/@{primary_range_weapon_split_dicepool})]]d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{roll2=[[[[floor((@{primary_range_weapon_rating}+@{primary_range_weapon_attr_rating}+@{primary_range_weapon_spec}+@{primary_range_weapon_expert}+@{primary_range_weapon_dicepool_modifier}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})/@{primary_range_weapon_split_dicepool})]]d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{dice=[[(@{primary_range_weapon_rating}+@{primary_range_weapon_attr_rating}+@{primary_range_weapon_spec}+@{primary_range_weapon_expert}+@{primary_range_weapon_dicepool_modifier}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6]]}}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=@{primary_range_weapon}}}{{split_pool=[[@{primary_range_weapon_split_dicepool}]]}}{{desc=Damage: @{primary_range_weapon_damage}\nMode: @{primary_range_weapon_mode}\nAmmo: @{primary_range_weapon_ammo_type}\nSkill: @{primary_range_weapon_skill}, Attribute: @{primary_range_weapon_attribute}}}{{wilddie1=[[@{wild_die1}]]}}{{wilddie2=[[@{wild_die2}]]}}{{glitch1=[[0]]}}{{glitch2=[[0]]}}{{wilddie1_dice=[[0]]}}{{wilddie2_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{total_hits1=[[0]]}}{{total_hits2=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{split_pool_dicepool_1=[[0]]}}{{split_pool_dicepool_2=[[0]]}}",
 
 	natural_healing_physical: "@{gm_toggle} &{template:rolls-computed}{{header=@{character_name}}}{{base=^{natural} ^{healing} ^{physical}\n^{body} + ^{body}}}{{dice=[[(@{body}+@{body}+?{Medical Care?|No,0|Yes,2})d6>5cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=Natural Healing (Physical), This test can be performed once per 24 hours of rest to recover Overflow/Physical damage.\n\n&star; Duration is halved with the Quick Healer quality.}}{{wilddie=[[@{wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
@@ -9094,7 +9133,7 @@ var disable_ranged_mods = () => {
 		const regex = /_(-.*)$/;
 		var rowID = eventInfo.triggerName.match(regex)[1];
 
-		getAttrs([`${weap}_name`, `${weap}_dicepool_modifier`, `${weap}_spec`, `${weap}_expert`, `${weap}_skill`, `${weap}_attribute`, `${weap}_attr_rating`, `${weap}_primary`, `${weap}_firing_modes`, `${weap}_default_mode`, `${weap}_damage`, `${weap}_close`, `${weap}_near`, `${weap}_medium`, `${weap}_far`, `${weap}_extreme`, `${weap}_has_mods`, `sheet_type`], (v) => {
+		getAttrs([`${weap}_name`, `${weap}_dicepool_modifier`, `${weap}_spec`, `${weap}_expert`, `${weap}_skill`, `${weap}_attribute`, `${weap}_attr_rating`, `${weap}_primary`, `${weap}_firing_modes`, `${weap}_default_mode`, `${weap}_damage`, `${weap}_close`, `${weap}_near`, `${weap}_medium`, `${weap}_far`, `${weap}_extreme`, `${weap}_has_mods`, `${weap}_notes`, `sheet_type`], (v) => {
 			if(v.sheet_type != 'pc') {
 				return;
 			}
@@ -9139,7 +9178,7 @@ var disable_ranged_mods = () => {
 			/* if it is the primary weapon any update needs to be reflected on Core->Arms */
 			if (v[`${weap}_primary`] === "primary") {
 				//Shared attributes names.
-				let array = ["dicepool", "dicepool_modifier", "name", "damage", "skill", "rating", "close", "near", "medium", "far", "extreme", "spec", "expert", "attribute", "attr_rating", "default_mode"];
+				let array = ["dicepool", "dicepool_modifier", "name", "damage", "skill", "rating", "close", "near", "medium", "far", "extreme", "spec", "expert", "attribute", "attr_rating", "default_mode", "notes"];
 
 				//Add the range or melee specific ones
 				if(type === "range") {