diff --git a/Space1889/Historie.txt b/Space1889/Historie.txt
index acf54426bc..fa57fd94a3 100644
--- a/Space1889/Historie.txt
+++ b/Space1889/Historie.txt
@@ -1,3 +1,8 @@
+2022-05-21
+- Release v1.1
+- Design : Beschriftungen der Felder optimiert
+- Design : Umstellung auf Table-Design
+
 2022-05-18
 - Bugfix Issue #1: Berechnung Wahrnehmung
 - Bugfix Issue #2: Fehlerhafte Formel bei der Erfolgsberechnung
diff --git a/Space1889/README.md b/Space1889/README.md
index fbb1c46ef6..74fa0274ba 100644
--- a/Space1889/README.md
+++ b/Space1889/README.md
@@ -2,7 +2,7 @@
 
 Bei diesem Community-Bogen handelt es sich um ein rein privates Fan-Projekt.
 
-## 2022-05-19 V1.0.2
+## 2022-05-21 V1.1
 Community-Bogen für Space 1889 (Ubiquity)
 
 Github - https://github.com/Gorthian/Roll20_Space1889_CharacterSheet
diff --git a/Space1889/space1889.css b/Space1889/space1889.css
index 4978f114a6..371ab7f82e 100644
--- a/Space1889/space1889.css
+++ b/Space1889/space1889.css
@@ -1,7 +1,7 @@
 /*
 	EDITED by 			Gorthian
-	Version				1.0.2
-	Letzte Änderung		2022-05-19
+	Version				1.1
+	Letzte Änderung		2022-05-21
 	
 	GitHub				https://github.com/Gorthian/Roll20_Space1889_CharacterSheet
 	Wiki				https://github.com/Gorthian/Roll20_Space1889_CharacterSheet/wiki
@@ -43,7 +43,8 @@ div.sheet-content {
 								"primary-attributes	secondary-attributes"
 								"style health"
 								"skills skills"
-								"combat	misc"
+								"combat	combat"
+								"misc misc"
 }
 
 div.sheet-basics {
@@ -103,6 +104,22 @@ div.sheet-combat {
 div.sheet-misc {
 	display					: grid;
 	grid-area				: misc;
+	grid-template-areas		: "talents ressources weaknesses"
+}
+
+div.sheet-talents {
+	display					: grid;
+	grid-area				: talents;
+}
+
+div.sheet-ressources {
+	display					: grid;
+	grid-area				: ressources;
+}
+
+div.sheet-weaknesses {
+	display					: grid;
+	grid-area				: weaknesses;
 }
 
 div.sheet-footer {
@@ -120,23 +137,6 @@ div.sheet-box {
 	margin				: 5px;
 }
 
-div.sheet-skillentry {
-	display				: flex;
-}
-
-div.sheet-weaponentry {
-	display				: flex;
-	flex-wrap			: wrap;
-}
-
-div.sheet-weaponattribute {
-	display				: flex;
-	flex-direction		: column;
-	justify-content		: center;
-	text-align			: center;
-	margin				: 2px;
-}
-
 :is(div.sheet-weaponattribute, div.sheet-skillentry) select{
 	width	: auto;
 }
@@ -147,6 +147,24 @@ div.sheet-space1889 div.sheet-content :is(input, select, button) {
 	padding : 4px;
 }
 
+div.sheet-table {
+	display				: table;
+	width				: 100%;
+}
+
+div.sheet-table-row {
+	display				: table-row;
+	width				: 100%;
+}
+
+div.sheet-table-col {
+	display				: table-cell;
+}
+
+hr {
+	border-color		: black;
+}
+
 /* Chrome, Safari, Edge, Opera */
 input:read-only:-webkit-outer-spin-button,
 input:read-only::-webkit-inner-spin-button {
diff --git a/Space1889/space1889.html b/Space1889/space1889.html
index 5601e930ac..5ce2625630 100644
--- a/Space1889/space1889.html
+++ b/Space1889/space1889.html
@@ -1,7 +1,7 @@
 <!--
 	EDITED by 			Gorthian
-	Version				1.0.2
-	Letzte Änderung		2022-05-19
+	Version				1.1
+	Letzte Änderung		2022-05-21
 	
 	GitHub				https://github.com/Gorthian/Roll20_Space1889_CharacterSheet
 	Wiki				https://github.com/Gorthian/Roll20_Space1889_CharacterSheet/wiki
@@ -12,9 +12,13 @@
 <div class="sheet-wrapper sheet-space1889">
 	<div class="sheet-content">
 		<div class="sheet-basics sheet-box">
-			<p><span class="sheet-label" data-i18n="name"></span><input type="text" name="attr_character_name" /></p>
-			<p><span class="sheet-label" data-i18n="archetype"></span><input type="text" name="attr_archetype" /></p>
-			<p><span class="sheet-label" data-i18n="motivation"></span><input type="text" name="attr_motivation" /></p>
+			<div class="sheet-table">
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="name"></span><input type="text" name="attr_character_name" /></div>
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="archetype"></span><input type="text" name="attr_archetype" /></div>
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="motivation"></span><input type="text" name="attr_motivation" /></div>
+				</div>
+			</div>
 		</div>
 		<div class="sheet-primary-attributes sheet-box">
 			<h1><span data-i18n="primary-attributes"></h1>
@@ -27,12 +31,57 @@
 		</div>
 		<div class="sheet-secondary-attributes sheet-box">
 			<h1><span data-i18n="secondary-attributes"></h1>
-			<p><span class="sheet-label" data-i18n="size"></span><input type="number" name="attr_size-calc" readonly/><input type="number" name="attr_size-mod" /><input type="number" name="attr_size-sum" readonly/></p>
-			<p><span class="sheet-label" data-i18n="movement"></span><input type="number" name="attr_movement-calc" readonly/><input type="number" name="attr_movement-mod" /><input type="number" name="attr_movement-sum" readonly/></p>
-			<p><span class="sheet-label" data-i18n="perception"></span><input type="number" name="attr_perception-calc" readonly/><input type="number" name="attr_perception-mod" /><input type="number" name="attr_perception-sum" readonly/><button type="roll" value="&{template:default} {{name=^{perception} (@{character_name}) }} {{^{successes}=[[{(@{perception-sum}+?{Mod|0})d2}>2]]}}" name="roll_perception"></button></p>
-			<p><span class="sheet-label" data-i18n="initiative"></span><input type="number" name="attr_initiative-calc" readonly/><input type="number" name="attr_initiative-mod" /><input type="number" name="attr_initiative-sum" readonly/><button type="roll" value="&{template:default} {{name=^{initiative} (@{character_name}) }} {{^{successes}=[[{(@{initiative-sum}+?{Mod|0})d2}>2]]}}" name="roll_initiative"></button></p>
-			<p><span class="sheet-label" data-i18n="defense"></span><input type="number" name="attr_defense-calc" readonly/><input type="number" name="attr_defense-mod" /><input type="number" name="attr_defense-sum" readonly/><button type="roll" value="&{template:default} {{name=^{defense} (@{character_name}) }} {{^{successes}=[[{(@{defense-sum}+?{Mod|0})d2}>2]]}}" name="roll_defense"></button></p>
-			<p><span class="sheet-label" data-i18n="stunned"></span><input type="number" name="attr_stunned-calc" readonly/><input type="number" name="attr_stunned-mod" /><input type="number" name="attr_stunned-sum" readonly/></p>
+			<div class="sheet-table">
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"></div>
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="value"></span></div>
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="modificator-short"></span></div>
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="sum"></span></div>
+					<div class="sheet-table-col"></div>
+				</div>
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="size"></span></div>
+					<div class="sheet-table-col"><input type="number" name="attr_size-calc" readonly/></div>
+					<div class="sheet-table-col"><input type="number" name="attr_size-mod" /></div>
+					<div class="sheet-table-col"><input type="number" name="attr_size-sum" readonly/></div>
+					<div class="sheet-table-col"></div>
+				</div>
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="movement"></span></div>
+					<div class="sheet-table-col"><input type="number" name="attr_movement-calc" readonly/></div>
+					<div class="sheet-table-col"><input type="number" name="attr_movement-mod" /></div>
+					<div class="sheet-table-col"><input type="number" name="attr_movement-sum" readonly/></div>
+					<div class="sheet-table-col"></div>
+				</div>
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="perception"></span></div>
+					<div class="sheet-table-col"><input type="number" name="attr_perception-calc" readonly/></div>
+					<div class="sheet-table-col"><input type="number" name="attr_perception-mod" /></div>
+					<div class="sheet-table-col"><input type="number" name="attr_perception-sum" readonly/></div>
+					<div class="sheet-table-col"><button type="roll" value="&{template:default} {{name=^{perception} (@{character_name}) }} {{^{successes}=[[{(@{perception-sum}+?{Mod|0})d2}>2]]}}" name="roll_perception"></button></div>
+				</div>
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="initiative"></span></div>
+					<div class="sheet-table-col"><input type="number" name="attr_initiative-calc" readonly/></div>
+					<div class="sheet-table-col"><input type="number" name="attr_initiative-mod" /></div>
+					<div class="sheet-table-col"><input type="number" name="attr_initiative-sum" readonly/></div>
+					<div class="sheet-table-col"><button type="roll" value="&{template:default} {{name=^{initiative} (@{character_name}) }} {{^{successes}=[[{(@{initiative-sum}+?{Mod|0})d2}>2]]}}" name="roll_initiative"></button></div>
+				</div>
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="defense"></span></div>
+					<div class="sheet-table-col"><input type="number" name="attr_defense-calc" readonly/></div>
+					<div class="sheet-table-col"><input type="number" name="attr_defense-mod" /></div>
+					<div class="sheet-table-col"><input type="number" name="attr_defense-sum" readonly/></div>
+					<div class="sheet-table-col"><button type="roll" value="&{template:default} {{name=^{defense} (@{character_name}) }} {{^{successes}=[[{(@{defense-sum}+?{Mod|0})d2}>2]]}}" name="roll_defense"></button></div>
+				</div>
+				<div class="sheet-table-row">
+					<div class="sheet-table-col"><span class="sheet-label" data-i18n="stunned"></span></div>
+					<div class="sheet-table-col"><input type="number" name="attr_stunned-calc" readonly/></div>
+					<div class="sheet-table-col"><input type="number" name="attr_stunned-mod" /></div>
+					<div class="sheet-table-col"><input type="number" name="attr_stunned-sum" readonly/></div>
+					<div class="sheet-table-col"></div>
+				</div>
+			</div>						
 		</div>
 		<div class="sheet-style sheet-box">
 			<h1><span data-i18n="style"></h1>
@@ -43,64 +92,105 @@
 			<p><input type="number" name="attr_health_current" /> / <input type="number" name="attr_health_max" readonly/></p>
 		</div>
 		<div class="sheet-skills sheet-box">
-			<h1><span data-i18n="skills"></h1>
+			<h1><span data-i18n="skills"></h1>						
 			<fieldset class="repeating_skills">
-				<div class="sheet-skillentry">
-					<input type="text" name="attr_skill-name" value="" />
-					<select name="attr_skill-attribute">
-						<option value="constitution" data-i18n="constitution-short"></option>
-						<option value="dexterity" data-i18n="dexterity-short"></option>
-						<option value="strength" data-i18n="strength-short"></option>
-						<option value="charisma" data-i18n="charisma-short"></option>
-						<option value="intelligence" data-i18n="intelligence-short"></option>
-						<option value="willpower" data-i18n="willpower-short"></option>
-					</select>
-					+<input type="number" name="attr_skill-level" value="" />
-					=<input type="number" name="attr_skill-value" value="" readonly/>
-					(<input type="number" name="attr_skill-average" value="" readonly/>)
-					<button type="roll" value="&{template:default} {{name=@{skill-name} (@{character_name}) }} {{^{successes}=[[{(@{skill-value}+?{Mod|0})d2}>2]]}}" name="roll_skill"></button>
+			<div class="sheet-skillentry sheet-box">
+				<div class="sheet-table">
+					<div class="sheet-table-row">
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="name"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="attribute"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="level"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="value"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="average"></span></div>
+						<div class="sheet-table-col"></div>
+					</div>
+					<div class="sheet-table-row sheet-skillentry">
+						<div class="sheet-table-col"><input type="text" name="attr_skill-name" value="" /></div>
+						<div class="sheet-table-col">
+							<select name="attr_skill-attribute">
+								<option value="constitution" data-i18n="constitution-short"></option>
+								<option value="dexterity" data-i18n="dexterity-short"></option>
+								<option value="strength" data-i18n="strength-short"></option>
+								<option value="charisma" data-i18n="charisma-short"></option>
+								<option value="intelligence" data-i18n="intelligence-short"></option>
+								<option value="willpower" data-i18n="willpower-short"></option>
+							</select>
+						</div>
+						<div class="sheet-table-col">+<input type="number" name="attr_skill-level" value="" /></div>
+						<div class="sheet-table-col">=<input type="number" name="attr_skill-value" value="" readonly/></div>
+						<div class="sheet-table-col">(<input type="number" name="attr_skill-average" value="" readonly/>)</div>
+						<div class="sheet-table-col"><button type="roll" value="&{template:default} {{name=@{skill-name} (@{character_name}) }} {{^{successes}=[[{(@{skill-value}+?{Mod|0})d2}>2]]}}" name="roll_skill"></button></div>
+					</div>
 				</div>
+			</div>
 			</fieldset>
 		</div>
-		<div class="sheet-combat">
+		<div class="sheet-combat sheet-box">
 			<h1><span data-i18n="combat"></h1>
 			<fieldset class="repeating_weapons">
-				<div class="sheet-weaponentry sheet-box">
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="weapon"></span><input type="text" name="attr_weapon-name" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="damage"></span>
-						<select name="attr_weapon-damage">
-							<option value="lethal" data-i18n="lethal"></option>
-							<option value="nonlethal" data-i18n="nonlethal"></option>							
-						</select>
+			<div class="sheet-weaponentry sheet-box">
+				<div class="sheet-table">
+					<div class="sheet-table-row">
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="weapon"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="damage"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="speed"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="modifier"></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="attack"></span></span></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="average"></span></div>
+					</div>
+					<div class="sheet-table-row">
+						<div class="sheet-table-col sheet-weaponattribute"><input type="text" name="attr_weapon-name" value=""/></div>
+						<div class="sheet-table-col sheet-weaponattribute">
+							<input type="number" name="attr_weapon-damage-value" value=""/>
+							<select name="attr_weapon-damage-type">
+								<option value="lethal" data-i18n="lethal"></option>
+								<option value="nonlethal" data-i18n="nonlethal"></option>							
+							</select>
+						</div>
+						<div class="sheet-table-col sheet-weaponattribute">
+							<select name="attr_weapon-speed">
+								<option value="S" data-i18n="weapon-fast"></option>
+								<option value="D" data-i18n="weapon-average" SELECTED></option>
+								<option value="L" data-i18n="weapon-slow"></option>
+							</select>
+						</div>
+						<div class="sheet-table-col sheet-weaponattribute"><input type="number" name="attr_weapon-modifier" value=""/></div>
+						<div class="sheet-table-col sheet-weaponattribute"><input type="number" name="attr_weapon-attack" value=""/></div>
+						<div class="sheet-table-col sheet-weaponattribute">(<input type="number" name="attr_weapon-average" value="" readonly/>)</div>
+						<div class="sheet-table-col sheet-weaponattribute"><button type="roll" value="&{template:default} {{name=@{weapon-name} (@{character_name})}} {{^{successes}=[[{(@{weapon-attack}+@{weapon-modifier}+?{Mod|0})d2}>2]]}} {{^{damage}=@{weapon-damage-value} ^{@{weapon-damage-type}}}}" name="roll_skill"></button></div>
 					</div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="modifier"></span><input type="number" name="attr_weapon-modifier" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="attack"></span><input type="number" name="attr_weapon-attack" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="average"></span><input type="number" name="attr_weapon-average" value="" readonly/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="range"></span><input type="number" name="attr_weapon-range" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="capacity"></span><input type="number" name="attr_weapon-capacity" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="firerate"></span><input type="number" name="attr_weapon-firerate" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="speed"></span><input type="number" name="attr_weapon-speed" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="weight"></span><input type="number" name="attr_weapon-weight" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="ammo"></span><input type="number" name="attr_weapon-ammo" value=""/></div>
-					<div class="sheet-weaponattribute"><span class="sheet-label" data-i18n="note"></span><input type="text" name="attr_weapon-note" value=""></div>
-					<button type="roll" value="&{template:default} {{name=@{weapon-name} (@{character_name})}} {{^{successes}=[[{(@{weapon-attack}+@{weapon-modifier}+?{Mod|0})d2}>2]]}} {{^{damage}=^{@{weapon-damage}}}}" name="roll_skill"></button>
 				</div>
+				<div class="sheet-table">
+					<div class="sheet-table-row">
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="range"></span></div>
+						<div class="sheet-table-col sheet-weaponattribute"><input type="number" name="attr_weapon-range" value=""/></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="capacity"></span></div>
+						<div class="sheet-table-col sheet-weaponattribute"><input type="number" name="attr_weapon-capacity" value=""/></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="firerate"></span></div>
+						<div class="sheet-table-col sheet-weaponattribute"><input type="number" name="attr_weapon-firerate" value=""/></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="weight"></span></div>
+						<div class="sheet-table-col sheet-weaponattribute"><input type="number" name="attr_weapon-weight" value=""/></div>
+						<div class="sheet-table-col"><span class="sheet-label" data-i18n="ammo"></span></div>						
+						<div class="sheet-table-col sheet-weaponattribute"><input type="number" name="attr_weapon-ammo" value=""/></div>
+					</div>
+				</div>
+			</div>
 			</fieldset>
 		</div>
 		<div class="sheet-misc">
-			<div class="sheet-box">
+			<div class="sheet-box sheet-talents">
 				<h2><span data-i18n="talents"></span></h2>
 				<fieldset class="repeating_talents">
 					<input type="text" name="attr_talent-name" value="">
 				</fieldset>
 			</div>
-			<div class="sheet-box">
+			<div class="sheet-box sheet-ressources">
 				<h2><span data-i18n="ressources"></span></h2>
 				<fieldset class="repeating_ressources">
 					<input type="text" name="attr_ressources-name" value="">
 				</fieldset>
 			</div>
-			<div class="sheet-box">
+			<div class="sheet-box sheet-weaknesses">
 				<h2><span data-i18n="weaknesses"></span></h2>
 				<fieldset class="repeating_weaknesses">
 					<input type="text" name="attr_weakness-name" value="">
diff --git a/Space1889/translation.json b/Space1889/translation.json
index c14da17f75..0c3b3e683c 100644
--- a/Space1889/translation.json
+++ b/Space1889/translation.json
@@ -2,6 +2,7 @@
   "name" : "Name",
   "archetype" : "Archetyp",
   "motivation" : "Motivation",
+  "attribute" : "Attribut",
   "primary-attributes" : "Primäre Attribute",
   "secondary-attributes" : "Sekundäre Attribute",
   "style" : "Stil",
@@ -43,5 +44,12 @@
   "weaknesses" : "Schwächen",
   "successes" : "Erfolge",
   "lethal" : "Tödlich",
-  "nonlethal" : "Nicht tödlich"
+  "nonlethal" : "Nicht tödlich",
+  "value" : "Wert",
+  "modificator-short" : "Mod.",
+  "sum" : "Summe",
+  "level" : "Stufe",
+  "weapon-fast" : "Schnell (S)",
+  "weapon-average" : "Durchschnittlich (D)",
+  "weapon-slow" : "Langsam (L)"
 }
\ No newline at end of file