diff --git a/templates/dig.html b/templates/dig.html
index 7394754..4f30aa1 100644
--- a/templates/dig.html
+++ b/templates/dig.html
@@ -91,9 +91,49 @@
 	{% endfor %}
 	</ul>
 	{% else %}
-	<p>No <code>MX</code> (Mail Exchange) records.</p>
+	<p id="mx">No <code>MX</code> (Mail Exchange) records.</p>
 	{% endif %}
 
+	{% if r.soa %}
+	<p id="soa"><code>SOA</code> (Source of Authority) records:</p>
+		<ul>
+			{% for soa in r.soa %}
+			<li><dl class="box">
+				<dt>MName (Original Source)</dt>
+				<dd>{{ helper::dig(extra=extra,name=soa.mname) }}</dd>
+				<dt>RName (Responsible)</dt>
+				<dd>{{ helper::dig(extra=extra,name=soa.rname) }}</dd>
+				<dt>Serial</dt>
+				<dd>{{soa.serial}}</dd>
+				<dt>Refresh</dt>
+				<dd>{{soa.refresh / 60 | round(precision=2) }}m</dd>
+				<dt>Retry </dt>
+				<dd>{{soa.retry / 60 | round(precision=2) }}m</dd>
+				<dt>Expire</dt>
+				<dd>{{soa.expire / 3600 | round(precision=2) }}h</dd>
+				<dt>Minimum</dt>
+				<dd>{{soa.minimum / 60 | round(precision=2) }}m</dd>
+			</dl></li>
+			{% endfor %}
+		</ul>
+	{% else %}
+	<p id="soa">No <code>SOA</code> records.</p>
+	{% endif %}
+
+
+
+	{% if r.ns %}
+	<p id="ns"><code>NS</code> (Name Server) records:</p>
+	<ul class="link-list">
+	{% for ns in r.ns | sort  %}
+	<li>{{ helper::dig(extra=extra, name=ns) }}</li>
+	{% endfor %}
+	</ul>
+	{% else %}
+	<p id="ns">No <code>NS</code> (Name Server) records.</p>
+	{% endif %}
+
+
 	{% if r.caa %}
 	<p id="caa"><code>CAA</code> (<a targt="_blank" href="https://de.wikipedia.org/wiki/DNS_Certification_Authority_Authorization">Certification Authority Authorization</a>) records:</p>
 		<ul>
@@ -118,9 +158,9 @@
 
 	{% if r.srv %}
 	<p id="srv"><code>SRV</code> records:</p>
-		<ul class="link-list">
+		<ul>
 			{% for srv in r.srv %}
-			<dl class="box">
+			<li><dl class="box">
 				<dt>Priority</dt>
 				<dd>{{srv.priority}}</dd>
 				<dt>Weight</dt>
@@ -129,7 +169,7 @@
 				<dd>{{srv.port}}</dd>
 				<dt>Target</dt>
 				<dd>{{ helper::dig(extra=extra,name=srv.target) }}</dd>
-			</dl>
+			</dl></li>
 			{% endfor %}
 		</ul>
 	{% else %}