diff --git a/css/custom.css b/css/custom.css
index e0c6c04..2d33053 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -2,16 +2,16 @@
 	display: none;
 } 
 #dummy-row:only-child {
-	display: block;
+	display: table-row;
 } 
 
 input:invalid {
 	border: 2px solid red;
 }
 
-td.combatantDice, td.combatantRea {
+/*td.combatantDice, td.combatantRea {
 	width: 35%;
 }
 
 button:disabled {
-} 
+} */
diff --git a/img/001-refresh.png b/img/001-refresh.png
new file mode 100644
index 0000000..2795584
Binary files /dev/null and b/img/001-refresh.png differ
diff --git a/img/002-dead-body.png b/img/002-dead-body.png
new file mode 100644
index 0000000..20b4a7b
Binary files /dev/null and b/img/002-dead-body.png differ
diff --git a/img/003-shooting.png b/img/003-shooting.png
new file mode 100644
index 0000000..4296651
Binary files /dev/null and b/img/003-shooting.png differ
diff --git a/img/004-edit-button.png b/img/004-edit-button.png
new file mode 100644
index 0000000..7d27e8a
Binary files /dev/null and b/img/004-edit-button.png differ
diff --git a/img/005-add.png b/img/005-add.png
new file mode 100644
index 0000000..a2c013b
Binary files /dev/null and b/img/005-add.png differ
diff --git a/img/006-dice.png b/img/006-dice.png
new file mode 100644
index 0000000..59e2f86
Binary files /dev/null and b/img/006-dice.png differ
diff --git a/index.html b/index.html
index 0ca19fc..19a2199 100644
--- a/index.html
+++ b/index.html
@@ -25,10 +25,10 @@
 	<body>
 		<div class="container">
 			<header class="navbar navbar-expand bg-success bg-opacity-25">
-				<span class="navbar-brand text-bold ps-4">Shadowrun 2 Initiative Tracker</span>
+				<span class="navbar-brand text-bold ps-4">SR2 Initiative Tracker</span>
 				<nav class="container-fluid justify-content-end" aria-label="Main navigation">
-					<button type="submit" class="btn btn-light btn-rounded mx-1" id="addCombatantButton" title="Add combatant"><img src="png/001-add.png" /></button>
-					<button type="submit" class="btn btn-light btn-rounded mx-1" id="newRoundButton" data-bs-toggle="modal" data-bs-target="#newRoundModal" title="Begin new round"><img src="png/009-refresh.png" /></button>
+					<button type="submit" class="btn btn-light btn-rounded mx-1 p-1" id="addCombatantButton" title="Add combatant"><img src="img/005-add.png" /></button>
+					<button type="submit" class="btn btn-light btn-rounded mx-1 p-1" id="newRoundButton" data-bs-toggle="modal" data-bs-target="#newRoundModal" title="Begin new round"><img src="img/001-refresh.png" /></button>
 				</nav>
 			</header>
 			</br>
@@ -36,24 +36,24 @@
 				<table class="table table-sm" id="combatantsTable">
 					<thead>
 						<tr>
-							<th class="col-sm-5 text-start" title="Name">Name</th>
-							<th class="col-sm-2 text-center" title="Initiative">Initiative</th>
-							<th class="col-sm-2 text-center" title="Initiative Dice and Reaction">Ini Dice & REA</th>
-							<th class="col-sm-3 text-center" title="Available Actions">Actions</th>
+							<th class="col-4 text-start" title="Name">Name</th>
+							<th class="col-2 text-center" title="Initiative">Ini</th>
+							<th class="col-2 text-center" title="Initiative Dice and Reaction"><img src="img/006-dice.png" />+R</th>
+							<th class="col-4 text-center" title="Actions">Actions</th>
 						</tr>
 					</thead>
-					<tbody class="align-middle">
-						<tr id="dummy-row">
-							<td class="col-sm text-muted" colspan="4">No combatants yet …</td>
+					<tbody>
+<!--						<tr id="dummy-row" colspan="100%">
+							<td class="col-sm text-muted">No combatants yet …</td>
 						</tr>
-					</tbody>
+-->					</tbody>
 				</table>
 			</div>
 		</div>
 
 		<div class="modal fade" id="newRoundModal" tabindex="-2">
-			<div class="modal-dialog">
-				<div class="modal-content modal-sm">
+			<div class="modal-dialog modal-sm">
+				<div class="modal-content">
 					<div class="modal-header">
 						<h5 class="modal-title">Start New Round</h5>
 						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
@@ -70,33 +70,32 @@
 		</div>
 
 		<div class="modal fade" id="combatantModal" tabindex="-1">
-			<div class="modal-dialog">
-				<div class="modal-content modal-sm">
+			<div class="modal-dialog modal-sm">
+				<div class="modal-content">
 					<div class="modal-header">
 						<h5 class="modal-title">Add New Combatant</h5>
 						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 					</div>
 					<div class="modal-body">
 						<form id="combatantForm" name="combatantModalForm" class="was-validated" onsubmit="return false;">
-							<div class="form-outline mb-4">
-								<input type="text" maxlength="40" class="form-control" id="combatantModalName" form="combatantModalForm" id="newCombName" placeholder="Name" required />
+							<div class="my-2">
+								<input type="text" maxlength="40" class="form-control form-control-sm" id="combatantModalName" form="combatantModalForm" id="newCombName" placeholder="Name" required />
 							</div>
-							<div class="form-outline mb-4">
+							<div class="my-2">
 								<div class="input-group">
-									<input type="number" min="1" max="5" class="form-control" id="combatantModalDice" form="combatantModalForm" placeholder="Dice" />
+									<input type="number" min="1" max="5" class="form-control form-control-sm" id="combatantModalDice" form="combatantModalForm" placeholder="Dice" />
 									<span class="input-group-text">D+</span>
-									<input type="number" min="1" max="25" class="form-control" id="combatantModalRea" form="combatantModalForm" placeholder="REA" />
+									<input type="number" min="1" max="25" class="form-control form-control-sm" id="combatantModalRea" form="combatantModalForm" placeholder="REA" />
 								</div>
-							<div class="form-outline mb-4">
-							</div>
-								<input type="number" min="0" max="55" class="form-control" id="combatantModalIni" form="combatantModalForm" placeholder="Ini" />
+							<div class="my-2">
+								<input type="number" min="0" max="55" class="form-control form-control-sm" id="combatantModalIni" form="combatantModalForm" placeholder="Ini" />
 							</div>
 						</form>
 					</div>
 					<div class="modal-footer">
 						<button type="button" class="btn btn-secondary" id="combatantModalCancelButton" data-bs-dismiss="modal">Cancel</button>
-						<button type="submit" class="btn btn-primary" id="combatantModalAddOkButton">OK (add)</button>
-						<button type="submit" class="btn btn-primary" id="combatantModalEditOkButton" style="display: none">OK (edit)</button>
+						<button type="submit" class="btn btn-primary" id="combatantModalAddOkButton">OK</button>
+						<button type="submit" class="btn btn-primary" id="combatantModalEditOkButton" style="display: none">OK</button>
 					</div>
 				</div>
 			</div>
diff --git a/js/sr2ini.js b/js/sr2ini.js
index 2e01ec9..3e34081 100644
--- a/js/sr2ini.js
+++ b/js/sr2ini.js
@@ -224,25 +224,15 @@ function addCombatant (e) {
 
 	// construct jQuery object for table row
 	let $tr = $($.parseHTML( [
-		'<tr class="combatantRow">\n',
+		'<tr class="combatantRow align-middle">\n',
 			'<td class="combatantName" title="Combatant\'s name">', name, '</td>\n',
 			'<td class="combatantIni text-center" title="Initiative">', ini, '</td>\n',
-			'<td>\n',
-				'<div>\n',
-				'<table class="table table-sm table-borderless m-0 p-0 combatantDiceAndRea">\n',
-					'<tr>\n',
-						'<td class="combatantDice text-end" title="Number of initiative dice">', dice, '</td>\n',
-						'<td class="text-center"><img src="png/002-dice.png" />+</td>\n',
-						'<td class="combatantRea text-start" title="Reaction">', rea, '</td>\n',
-					'</tr>\n',
-				'</table>\n',
-				'</div>\n',
-			'</td>\n',
+			'<td class="text-center combatantDiceAndRea" title="Iniative dice and reaction"><span class="combatantDice">', dice, '</span>D+<span class="combatantRea">', rea, '</span></td>\n',
 			'<td class="text-end">\n',
 				'<div class="btn-group">\n',
-					'<button type="button" class="btn btn-light btn-rounded mx-1 edit-button" title="Edit combatant\'s values"><img src="png/005-edit-button.png" /></button>\n',
-					'<button type="button" class="btn btn-light btn-rounded mx-1 act-button" title="Act and reduce ini by 10"><img src="png/004-shooting.png" /></button>\n',
-					'<button type="button" class="btn btn-light btn-rounded mx-1 remove-button" title="Remove combatant"><img src="png/003-dead-body.png" /></button>\n',
+					'<button type="button" class="btn btn-light btn-rounded mx-1 p-1 edit-button" title="Edit combatant\'s values"><img src="img/004-edit-button.png" /></button>\n',
+					'<button type="button" class="btn btn-light btn-rounded mx-1 p-1 act-button" title="Act and reduce ini by 10"><img src="img/003-shooting.png" /></button>\n',
+					'<button type="button" class="btn btn-light btn-rounded mx-1 p-1 remove-button" title="Remove combatant"><img src="img/002-dead-body.png" /></button>\n',
 				'</div>\n',
 			'</td>\n',
 		'</tr>'].join("")
diff --git a/png/001-add.png b/png/001-add.png
deleted file mode 100644
index 55e37f3..0000000
Binary files a/png/001-add.png and /dev/null differ
diff --git a/png/002-dice.png b/png/002-dice.png
deleted file mode 100644
index cb2a0fc..0000000
Binary files a/png/002-dice.png and /dev/null differ
diff --git a/png/003-dead-body.png b/png/003-dead-body.png
deleted file mode 100644
index 48e5f82..0000000
Binary files a/png/003-dead-body.png and /dev/null differ
diff --git a/png/004-shooting.png b/png/004-shooting.png
deleted file mode 100644
index 7cf37e2..0000000
Binary files a/png/004-shooting.png and /dev/null differ
diff --git a/png/005-edit-button.png b/png/005-edit-button.png
deleted file mode 100644
index 7d87f1f..0000000
Binary files a/png/005-edit-button.png and /dev/null differ
diff --git a/png/006-patient.png b/png/006-patient.png
deleted file mode 100644
index 9df691c..0000000
Binary files a/png/006-patient.png and /dev/null differ
diff --git a/png/007-band-aid.png b/png/007-band-aid.png
deleted file mode 100644
index fcac949..0000000
Binary files a/png/007-band-aid.png and /dev/null differ
diff --git a/png/008-synchronization.png b/png/008-synchronization.png
deleted file mode 100644
index 1c6b1f0..0000000
Binary files a/png/008-synchronization.png and /dev/null differ
diff --git a/png/009-refresh.png b/png/009-refresh.png
deleted file mode 100644
index c4e6d4c..0000000
Binary files a/png/009-refresh.png and /dev/null differ
diff --git a/png/010-add-user.png b/png/010-add-user.png
deleted file mode 100644
index b9b6100..0000000
Binary files a/png/010-add-user.png and /dev/null differ
