diff --git a/app/Classes/Protocol.php b/app/Classes/Protocol.php
index 8093a05..cba7c4a 100644
--- a/app/Classes/Protocol.php
+++ b/app/Classes/Protocol.php
@@ -275,7 +275,7 @@ abstract class Protocol
 
 		Log::info(sprintf('%s:   Total: %s - %d:%02d:%02d online, (%d) %lu%s sent, (%d) %lu%s received - %s',
 			__METHOD__,
-			$this->node->address,
+			$this->node->address->ftn,
 			$this->node->session_time/3600,
 			$this->node->session_time%3600/60,
 			$this->node->session_time%60,
diff --git a/app/Models/System.php b/app/Models/System.php
index 20d2ed8..e5dc662 100644
--- a/app/Models/System.php
+++ b/app/Models/System.php
@@ -47,6 +47,14 @@ class System extends Model
 		return $this->hasOne(Setup::class);
 	}
 
+	/**
+	 * This system is the ZC for the following zones
+	 */
+	public function zcs()
+	{
+		return $this->belongsToMany(Zone::class);
+	}
+
 	/**
 	 * Zones a system has addresses for
 	 *
diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php
index 369c69b..3121c3a 100644
--- a/resources/views/domain/view.blade.php
+++ b/resources/views/domain/view.blade.php
@@ -206,6 +206,8 @@
 				paging: true,
 				pageLength: 25,
 				searching: true,
+				ordering: true,
+				order: [],
 				conditionalPaging: {
 					style: 'fade',
 					speed: 500 // optional
diff --git a/resources/views/system/addedit.blade.php b/resources/views/system/addedit.blade.php
index aee5065..d518cfd 100644
--- a/resources/views/system/addedit.blade.php
+++ b/resources/views/system/addedit.blade.php
@@ -9,11 +9,15 @@ use App\Http\Controllers\DomainController as DC;
 @endphp
 
 @section('content')
-	@if ($o->exists)
+	@if($o->exists)
 		<h1>{{ $o->name }}@if($o->setup)<sup class="success" style="text-shadow: 0 0; font-size: 50%; top: -1em;">*</sup>@endif</h1>
 		@if($o->setup)<sup class="success" style="float:right;top:-2em;">* This Host</sup>@endif
 	@endif
 
+	@if($o->zcs)
+		<p>This system is the ZC for the following zones: <strong class="highlight">{!! $o->zcs->map(function($item) { return sprintf('%d@%s',$item->zone_id,$item->domain->name); })->join('</strong>, <strong class="highlight">') !!} </strong></p>
+	@endif
+
 	<div class="accordion accordion-flush" id="accordion_homepage">
 		@if ($o->exists)
 			<!-- System -->
diff --git a/resources/views/system/home.blade.php b/resources/views/system/home.blade.php
index dc4658a..7f3f93f 100644
--- a/resources/views/system/home.blade.php
+++ b/resources/views/system/home.blade.php
@@ -32,6 +32,7 @@
 						<th>Connect</th>
 						<th>Address</th>
 						<th>ZeroTier ID</th>
+						<th>Addresses</th>
 					</tr>
 					</thead>
 
@@ -52,6 +53,7 @@
 							</td>
 							<td>{{ $oo->addresses->pluck('ftn')->join(', ') }}</td>
 							<td>{{ $oo->zt_id }}</td>
+							<td>{{ $oo->addresses->count() }}</td>
 						</tr>
 					@endforeach
 					</tbody>
diff --git a/resources/views/system/moveaddr.blade.php b/resources/views/system/moveaddr.blade.php
index 662b96b..e21451b 100644
--- a/resources/views/system/moveaddr.blade.php
+++ b/resources/views/system/moveaddr.blade.php
@@ -50,10 +50,10 @@ Move Address
 							<label for="remove" class="form-label">Delete System after Move</label>
 							<div class="input-group">
 								<div class="btn-group" role="group">
-									<input type="radio" class="btn-check" name="remove" id="remove_yes" value="1" @if($o->system->setup || $o->system->addresses->count() > 1)disabled @endif @if(old('remove',FALSE))checked @endif>
+									<input type="radio" class="btn-check" name="remove" id="remove_yes" value="1" @if($o->system->setup || $o->system->addresses->count()+$o->system->zcs->count() > 1)disabled @endif @if(old('remove',FALSE))checked @endif>
 									<label class="btn btn-outline-danger" for="remove_yes">Yes</label>
 
-									<input type="radio" class="btn-check" name="remove" id="remove_no" value="0" @if($o->system->addresses->count() > 1)disabled @endif @if(! old('remove',FALSE))checked @endif>
+									<input type="radio" class="btn-check" name="remove" id="remove_no" value="0" @if($o->system->addresses->count()+$o->system->zcs->count() > 1)disabled @endif @if(! old('remove',FALSE))checked @endif>
 									<label class="btn btn-outline-success" for="remove_no">No</label>
 								</div>
 							</div>