diff --git a/resources/views/echoarea/addedit.blade.php b/resources/views/echoarea/addedit.blade.php
index 2832846..8fed911 100644
--- a/resources/views/echoarea/addedit.blade.php
+++ b/resources/views/echoarea/addedit.blade.php
@@ -52,6 +52,7 @@
 							</div>
 						</div>
 
+						@can('admin',$o)
 						<div class="col-2">
 							<label for="active" class="form-label">Active</label>
 							<div class="input-group">
@@ -90,6 +91,7 @@
 								</div>
 							</div>
 						</div>
+						@endcan
 					</div>
 
 					<div class="row">
@@ -106,6 +108,7 @@
 							</div>
 						</div>
 
+						@can('admin',$o)
 						<div class="col-2">
 							<label for="sec_read" class="form-label">Read <i class="bi bi-info-circle" title="Min security level required for read access"></i></label>
 							<div class="input-group has-validation">
@@ -131,8 +134,10 @@
 								</span>
 							</div>
 						</div>
+						@endcan
 					</div>
 
+					@can('admin',$o)
 					<div class="row">
 						<div class="col-12">
 							<label for="notes" class="form-label">Notes</label>
@@ -143,11 +148,10 @@
 					<div class="row">
 						<div class="col-12">
 							<a href="{{ url('echoarea') }}" class="btn btn-danger">Cancel</a>
-							@can('admin',$o)
-								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
-							@endcan
+							<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
 						</div>
 					</div>
+					@endcan
 				</div>
 			</div>
 		</div>
diff --git a/resources/views/filearea/addedit.blade.php b/resources/views/filearea/addedit.blade.php
index 7318e3d..301ed47 100644
--- a/resources/views/filearea/addedit.blade.php
+++ b/resources/views/filearea/addedit.blade.php
@@ -1,4 +1,5 @@
 <!-- $o=Filearea::class -->
+@use(App\Models\Domain)
 @extends('layouts.app')
 
 @section('htmlheader_title')
@@ -21,7 +22,7 @@
 								<span class="input-group-text"><i class="bi bi-tag-fill"></i></span>
 								<select class="form-select @error('domain_id') is-invalid @enderror" id="domain" name="domain_id" required @cannot('admin',$o)disabled @endcannot>
 									<option value="">&nbsp;</option>
-									@foreach (\App\Models\Domain::active()->orderBy('name')->cursor() as $oo)
+									@foreach (Domain::active()->orderBy('name')->cursor() as $oo)
 										<option value="{{ $oo->id }}" @if(old('domain_id',$o->domain_id)==$oo->id)selected @endif>{{ $oo->name }}</option>
 									@endforeach
 								</select>
@@ -51,6 +52,7 @@
 							</div>
 						</div>
 
+						@can('admin',$o)
 						<div class="offset-1 col-2" style="padding-left: 20px;">
 							<label for="active" class="form-label">Active</label>
 							<div class="input-group">
@@ -76,6 +78,7 @@
 								</div>
 							</div>
 						</div>
+						@endcan
 					</div>
 
 					<div class="row">
@@ -92,6 +95,7 @@
 							</div>
 						</div>
 
+						@can('admin',$o)
 						<div class="col-3">
 							<label for="nodelist" class="form-label">Nodelist File Name</label>
 							<div class="input-group has-validation">
@@ -130,8 +134,10 @@
 								</span>
 							</div>
 						</div>
+						@endcan
 					</div>
 
+					@can('admin',$o)
 					<div class="row">
 						<div class="col-12">
 							<label for="notes" class="form-label">Notes</label>
@@ -142,11 +148,10 @@
 					<div class="row">
 						<div class="col-12">
 							<a href="{{ url('filearea') }}" class="btn btn-danger">Cancel</a>
-							@can('admin',$o)
-								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
-							@endcan
+							<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
 						</div>
 					</div>
+					@endcan
 				</div>
 			</div>
 		</div>