diff --git a/README.md b/README.md
index 2fb5c082..6e28c039 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ The update to v2 is progressing well - here is a list of work to do and done:
   - [X] Delete extra values for Attributes that support multiple values
   - [ ] Delete Attributes
 - [ ] Templates to enable entries to conform to a custom standard
+  - [ ] Autopopulate attribute values
 - [X] Login to LDAP server
   - [X] Configure login by a specific attribute
 - [X] Logout LDAP server
@@ -53,6 +54,7 @@ The update to v2 is progressing well - here is a list of work to do and done:
 - [X] Import LDIF
 - [X] Schema Browser
 - [ ] Searching
+- [ ] Enforcing attribute uniqueness
 - [ ] Is there something missing?
 
 Support is known for these LDAP servers:
diff --git a/resources/themes/architect/views/layouts/partials/contentheader.blade.php b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
index 897ed081..c4426d4c 100644
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@@ -27,7 +27,7 @@
 							@endif
 							@if(isset($page_actions) && $page_actions->contains('copy'))
 								<li>
-									<button class="btn btn-outline-dark p-1 m-1" id="entry-copy-move" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Copy/Move')"><i class="fas fa-fw fa-copy fs-5"></i></button>
+									<button class="btn btn-outline-dark p-1 m-1" id="entry-copy-move" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Copy/Move')" disabled><i class="fas fa-fw fa-copy fs-5"></i></button>
 								</li>
 							@endif
 							@if((isset($page_actions) && $page_actions->contains('edit')) || old())
diff --git a/resources/views/components/attribute/binary/jpegphoto.blade.php b/resources/views/components/attribute/binary/jpegphoto.blade.php
index 2bcccaa2..e23c01eb 100644
--- a/resources/views/components/attribute/binary/jpegphoto.blade.php
+++ b/resources/views/components/attribute/binary/jpegphoto.blade.php
@@ -14,7 +14,7 @@
 							@if ($edit)
 								<br>
 								<!-- @todo TO IMPLEMENT -->
-								<span class="btn btn-sm btn-danger deletable d-none mt-3"><i class="fas fa-trash-alt"></i> @lang('Delete')</span>
+								<button class="btn btn-sm btn-danger deletable d-none mt-3" disabled><i class="fas fa-trash-alt"></i> @lang('Delete')</button>
 
 								<div class="invalid-feedback pb-2">
 									@if($e)
diff --git a/resources/views/components/attribute/widget/options.blade.php b/resources/views/components/attribute/widget/options.blade.php
index fbed2c60..c5a45c77 100644
--- a/resources/views/components/attribute/widget/options.blade.php
+++ b/resources/views/components/attribute/widget/options.blade.php
@@ -1,11 +1,11 @@
 @php($clone=FALSE)
 @if($o->is_rdn)
-	<span class="btn btn-sm btn-outline-focus mt-3"><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</span>
+	<button class="btn btn-sm btn-outline-focus mt-3" disabled><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</button>
 @elseif($edit && $o->can_addvalues)
 	<span class="p-0 m-0">
 		@switch(get_class($o))
 			@case('App\Classes\LDAP\Attribute\Binary\JpegPhoto')
-				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name_lc }}"><i class="fas fa-fw fa-plus"></i> @lang('Upload JpegPhoto')</span>
+				<button @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name_lc }}" disabled><i class="fas fa-fw fa-plus"></i> @lang('Upload JpegPhoto')</button>
 
 				@break
 
diff --git a/resources/views/fragment/dn/add_attr.blade.php b/resources/views/fragment/dn/add_attr.blade.php
index 3a20a1e5..48487da0 100644
--- a/resources/views/fragment/dn/add_attr.blade.php
+++ b/resources/views/fragment/dn/add_attr.blade.php
@@ -18,5 +18,4 @@
 			</div>
 		</div>
 	</div>
-	<div class="col-2"></div>
 </div>
\ No newline at end of file