diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml
index 3e38d95f..375e9d1e 100644
--- a/.gitea/workflows/build_docker.yaml
+++ b/.gitea/workflows/build_docker.yaml
@@ -3,7 +3,7 @@ run-name: ${{ gitea.actor }} Building Docker Image 🐳
 on: [push]
 env:
   DOCKER_HOST: tcp://127.0.0.1:2375
-  ASSETS: 10eca55
+  ASSETS: 3fcb8707
 
 jobs:
   test:
diff --git a/app/Classes/LDAP/Attribute.php b/app/Classes/LDAP/Attribute.php
index 3f502e40..1459f068 100644
--- a/app/Classes/LDAP/Attribute.php
+++ b/app/Classes/LDAP/Attribute.php
@@ -148,6 +148,13 @@ class Attribute implements \Countable, \ArrayAccess
 			'description' => $this->schema ? $this->schema->{$key} : NULL,
 			// Attribute hints
 			'hints' => $this->hints(),
+			// Attribute language tags
+			'langtags' => ($this->no_attr_tags || (! $this->_values->count()))
+				? collect(Entry::TAG_NOTAG)
+				: $this->_values
+					->keys()
+					->filter(fn($item)=>($item === Entry::TAG_NOTAG) || preg_match(sprintf('/%s;?/',Entry::TAG_CHARS_LANG),$item))
+					->sortBy(fn($item)=>($item === Entry::TAG_NOTAG) ? NULL : $item),
 			// Can this attribute be edited
 			'is_editable' => $this->schema ? $this->schema->{$key} : NULL,
 			// Is this an internal attribute
@@ -198,17 +205,23 @@ class Attribute implements \Countable, \ArrayAccess
 
 	public function count(): int
 	{
-		return $this->_values->dot()->count();
+		return $this->_values
+			->dot()
+			->count();
 	}
 
 	public function offsetExists(mixed $offset): bool
 	{
-		return $this->_values->dot()->has($offset);
+		return $this->_values
+			->dot()
+			->has($offset);
 	}
 
 	public function offsetGet(mixed $offset): mixed
 	{
-		return $this->_values->dot()->get($offset);
+		return $this->_values
+			->dot()
+			->get($offset);
 	}
 
 	public function offsetSet(mixed $offset, mixed $value): void
@@ -315,11 +328,10 @@ class Attribute implements \Countable, \ArrayAccess
 	 * @param bool $edit Render an edit form
 	 * @param bool $old Use old value
 	 * @param bool $new Enable adding values
-	 * @param string $langtag Langtag to use when rendering these attribute values
 	 * @param bool $updated Has the entry been updated (uses rendering highlights))
 	 * @return View
 	 */
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		if ($this->is_internal)
 			// @note Internal attributes cannot be edited
@@ -340,7 +352,6 @@ class Attribute implements \Countable, \ArrayAccess
 			->with('edit',$edit)
 			->with('old',$old)
 			->with('new',$new)
-			->with('langtag',$langtag)
 			->with('updated',$updated);
 	}
 
@@ -376,7 +387,7 @@ class Attribute implements \Countable, \ArrayAccess
 	 *
 	 * @return Collection
 	 */
-	public function required(): Collection
+	private function required(): Collection
 	{
 		// If we dont have any objectclasses then we cant know if it is required
 		return $this->oc->count()
diff --git a/app/Classes/LDAP/Attribute/Binary/JpegPhoto.php b/app/Classes/LDAP/Attribute/Binary/JpegPhoto.php
index 37f64aa0..65734233 100644
--- a/app/Classes/LDAP/Attribute/Binary/JpegPhoto.php
+++ b/app/Classes/LDAP/Attribute/Binary/JpegPhoto.php
@@ -15,14 +15,13 @@ final class JpegPhoto extends Binary
 {
 	use MD5Updates;
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.binary.jpegphoto')
 			->with('o',$this)
 			->with('edit',$edit)
 			->with('old',$old)
 			->with('new',$new)
-			->with('langtag',$langtag)
 			->with('updated',$updated)
 			->with('f',new \finfo);
 	}
diff --git a/app/Classes/LDAP/Attribute/Internal/Timestamp.php b/app/Classes/LDAP/Attribute/Internal/Timestamp.php
index 72533331..845197ef 100644
--- a/app/Classes/LDAP/Attribute/Internal/Timestamp.php
+++ b/app/Classes/LDAP/Attribute/Internal/Timestamp.php
@@ -12,7 +12,7 @@ use App\Ldap\Entry;
  */
 final class Timestamp extends Internal
 {
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Internal attributes cannot be edited
 		return view('components.attribute.internal.timestamp')
diff --git a/app/Classes/LDAP/Attribute/KrbPrincipalKey.php b/app/Classes/LDAP/Attribute/KrbPrincipalKey.php
index 1fb378e6..7c88b0bd 100644
--- a/app/Classes/LDAP/Attribute/KrbPrincipalKey.php
+++ b/app/Classes/LDAP/Attribute/KrbPrincipalKey.php
@@ -17,7 +17,7 @@ final class KrbPrincipalKey extends Attribute
 
 	protected(set) bool $no_attr_tags = TRUE;
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.krbprincipalkey')
 			->with('o',$this)
diff --git a/app/Classes/LDAP/Attribute/KrbTicketFlags.php b/app/Classes/LDAP/Attribute/KrbTicketFlags.php
index 6921a9d3..80b62cae 100644
--- a/app/Classes/LDAP/Attribute/KrbTicketFlags.php
+++ b/app/Classes/LDAP/Attribute/KrbTicketFlags.php
@@ -50,7 +50,7 @@ final class KrbTicketFlags extends Attribute
 		return $helpers;
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.krbticketflags')
 			->with('o',$this)
diff --git a/app/Classes/LDAP/Attribute/ObjectClass.php b/app/Classes/LDAP/Attribute/ObjectClass.php
index ca179a4d..5536fb04 100644
--- a/app/Classes/LDAP/Attribute/ObjectClass.php
+++ b/app/Classes/LDAP/Attribute/ObjectClass.php
@@ -70,7 +70,7 @@ final class ObjectClass extends Attribute
 			->contains($value);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.objectclass')
 			->with('o',$this)
diff --git a/app/Classes/LDAP/Attribute/Password.php b/app/Classes/LDAP/Attribute/Password.php
index 964a5e8b..6c7cff45 100644
--- a/app/Classes/LDAP/Attribute/Password.php
+++ b/app/Classes/LDAP/Attribute/Password.php
@@ -80,7 +80,7 @@ final class Password extends Attribute
 		return ($helpers=static::helpers())->has($id) ? new ($helpers->get($id)) : NULL;
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.password')
 			->with('o',$this)
diff --git a/app/Classes/LDAP/Attribute/RDN.php b/app/Classes/LDAP/Attribute/RDN.php
index c28eb67e..64bb62f8 100644
--- a/app/Classes/LDAP/Attribute/RDN.php
+++ b/app/Classes/LDAP/Attribute/RDN.php
@@ -14,6 +14,9 @@ use App\Ldap\Entry;
 final class RDN extends Attribute
 {
 	private string $base;
+
+	protected(set) bool $no_attr_tags = TRUE;
+
 	private Collection $attrs;
 
 	public function __get(string $key): mixed
@@ -32,7 +35,7 @@ final class RDN extends Attribute
 		]);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		return view('components.attribute.rdn')
 			->with('o',$this);
diff --git a/app/Classes/LDAP/Attribute/Schema.php b/app/Classes/LDAP/Attribute/Schema.php
index 22941082..30ba55dd 100644
--- a/app/Classes/LDAP/Attribute/Schema.php
+++ b/app/Classes/LDAP/Attribute/Schema.php
@@ -54,7 +54,7 @@ abstract class Schema extends Attribute
 			__('No description available, can you help with one?'));
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.internal')
diff --git a/app/Classes/LDAP/Attribute/Schema/Generic.php b/app/Classes/LDAP/Attribute/Schema/Generic.php
index 64645d5d..bf3df008 100644
--- a/app/Classes/LDAP/Attribute/Schema/Generic.php
+++ b/app/Classes/LDAP/Attribute/Schema/Generic.php
@@ -12,7 +12,7 @@ use App\Ldap\Entry;
  */
 class Generic extends Schema
 {
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.generic')
diff --git a/app/Classes/LDAP/Attribute/Schema/Mechanisms.php b/app/Classes/LDAP/Attribute/Schema/Mechanisms.php
index 2cbf8396..be402a51 100644
--- a/app/Classes/LDAP/Attribute/Schema/Mechanisms.php
+++ b/app/Classes/LDAP/Attribute/Schema/Mechanisms.php
@@ -34,7 +34,7 @@ final class Mechanisms extends Schema
 		return parent::_get(config_path('ldap_supported_saslmechanisms.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.mechanisms')
diff --git a/app/Classes/LDAP/Attribute/Schema/OID.php b/app/Classes/LDAP/Attribute/Schema/OID.php
index 2b9765b0..166fd8be 100644
--- a/app/Classes/LDAP/Attribute/Schema/OID.php
+++ b/app/Classes/LDAP/Attribute/Schema/OID.php
@@ -35,7 +35,7 @@ final class OID extends Schema
 		return parent::_get(config_path('ldap_supported_oids.txt'),$string,$key);
 	}
 
-	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE): View
+	public function render(bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE): View
 	{
 		// @note Schema attributes cannot be edited
 		return view('components.attribute.schema.oid')
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index eee8c61e..aa040060 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -356,7 +356,9 @@ class HomeController extends Controller
 		return Redirect::to('/')
 			->withInput()
 			->with('updated',collect($dirty)
-				->map(fn($item,$key)=>$o->getObject(collect(explode(';',$key))->first())));
+				->map(fn($item,$key)=>$o->getObject(collect(explode(';',$key))->first()))
+				->values()
+				->unique());
 	}
 
 	/**
diff --git a/app/Ldap/Entry.php b/app/Ldap/Entry.php
index f8707fa8..63243e44 100644
--- a/app/Ldap/Entry.php
+++ b/app/Ldap/Entry.php
@@ -21,11 +21,16 @@ use App\Exceptions\InvalidUsage;
 class Entry extends Model
 {
 	private const TAG_CHARS = 'a-zA-Z0-9-';
-	private const TAG_CHARS_LANG = 'lang-['.self::TAG_CHARS.']';
+	public const LANG_TAG_PREFIX = 'lang-';
+	public const TAG_CHARS_LANG = self::LANG_TAG_PREFIX.'['.self::TAG_CHARS.']+';
 	public const TAG_NOTAG = '_null_';
 
 	// Our Attribute objects
 	private Collection $objects;
+
+	// Templates that apply to this entry
+	private(set) Collection $templates;
+
 	// For new entries, this is the container that this entry will be stored in
 	private string $rdnbase;
 
@@ -34,6 +39,7 @@ class Entry extends Model
 	public function __construct(array $attributes = [])
 	{
 		$this->objects = collect();
+		$this->templates = collect(['default'=>__('LDAP Entry')]);
 
 		parent::__construct($attributes);
 	}
@@ -308,14 +314,7 @@ class Entry extends Model
 	public function getLangTags(): Collection
 	{
 		return $this->getObjects()
-			->filter(fn($item)=>! $item->no_attr_tags)
-			->map(fn($item)=>$item
-				->values
-				->keys()
-				->filter(fn($item)=>preg_match(sprintf('/%s+;?/',self::TAG_CHARS_LANG),$item))
-				->map(fn($item)=>preg_replace('/lang-/','',$item))
-			)
-			->filter(fn($item)=>$item->count());
+			->map(fn($item)=>$item->langtags);
 	}
 
 	/**
@@ -373,7 +372,7 @@ class Entry extends Model
 					$item && collect(explode(';',$item))->filter(
 						fn($item)=>
 							(! preg_match(sprintf('/^%s$/',self::TAG_NOTAG),$item))
-							&& (! preg_match(sprintf('/^%s+$/',self::TAG_CHARS_LANG),$item))
+							&& (! preg_match(sprintf('/^%s$/',self::TAG_CHARS_LANG),$item))
 						)
 						->count())
 			)
diff --git a/app/View/Components/Attribute.php b/app/View/Components/Attribute.php
index 9e7b0344..cc12c0bd 100644
--- a/app/View/Components/Attribute.php
+++ b/app/View/Components/Attribute.php
@@ -6,7 +6,6 @@ use Illuminate\Contracts\View\View;
 use Illuminate\View\Component;
 
 use App\Classes\LDAP\Attribute as LDAPAttribute;
-use App\Ldap\Entry;
 
 class Attribute extends Component
 {
@@ -14,18 +13,16 @@ class Attribute extends Component
 	public bool $edit;
 	public bool $new;
 	public bool $old;
-	public string $langtag;
 
 	/**
 	 * Create a new component instance.
 	 */
-	public function __construct(?LDAPAttribute $o,bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,string $langtag=Entry::TAG_NOTAG,bool $updated=FALSE)
+	public function __construct(?LDAPAttribute $o,bool $edit=FALSE,bool $old=FALSE,bool $new=FALSE,bool $updated=FALSE)
 	{
 		$this->o = $o;
 		$this->edit = $edit;
 		$this->old = $old;
 		$this->new = $new;
-		$this->langtag = $langtag;
 		$this->updated = $updated;
 	}
 
@@ -38,7 +35,7 @@ class Attribute extends Component
 	{
 		return $this->o
 			? $this->o
-				->render(edit: $this->edit,old: $this->old,new: $this->new,langtag: $this->langtag,updated: $this->updated)
+				->render(edit: $this->edit,old: $this->old,new: $this->new,updated: $this->updated)
 			: __('Unknown');
 	}
 }
\ No newline at end of file
diff --git a/public/css/custom.css b/public/css/custom.css
index 47e325e3..0104ad4c 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -1,23 +1,24 @@
 /** ensure our userpassword has select is next to the password input */
-attribute#userPassword .select2-container--bootstrap-5 .select2-selection {
+attribute#userpassword .select2-container--bootstrap-5 .select2-selection {
 	font-size: inherit;
 	width: 9em;
 	border: var(--bs-gray-500) 1px solid;
 	background-color: #f0f0f0;
 }
 
-.input-group:first-child .select2-container--bootstrap-5 .select2-selection {
-	border-bottom-right-radius: unset;
-	border-top-right-radius: unset;
-}
-
-attribute#objectClass .input-group-end:not(input.form-control) {
+/* render the structural inside the input box */
+attribute#objectclass .input-group-end:not(input.form-control) {
 	position: absolute;
 	right: 1em;
 	top: 0.5em;
 	z-index: 5;
 }
 
+.input-group:first-child .select2-container--bootstrap-5 .select2-selection {
+	border-bottom-right-radius: unset;
+	border-top-right-radius: unset;
+}
+
 input.form-control.input-group-end {
 	border-bottom-right-radius: 4px !important;
 	border-top-right-radius: 4px !important;
@@ -82,4 +83,9 @@ input.form-control.input-group-end {
 
 .page-title-wrapper .page-title-items .page-title-status .alert {
 	font-size: 0.80em;
+}
+
+/* Square UL items */
+ul.square {
+	list-style-type: square;
 }
\ No newline at end of file
diff --git a/resources/themes/architect/src/utils/_helpers.scss b/resources/themes/architect/src/utils/_helpers.scss
index c25ca585..515877ce 100644
--- a/resources/themes/architect/src/utils/_helpers.scss
+++ b/resources/themes/architect/src/utils/_helpers.scss
@@ -90,6 +90,14 @@
   font-size: 1.3rem !important;
 }
 
+.font-size-xs {
+  font-size: .6rem !important;
+}
+
+.font-size-sm {
+  font-size: .8rem !important;
+}
+
 .font-size-md {
   font-size: .9rem !important;
 }
diff --git a/resources/themes/architect/views/layouts/partials/topmenu.blade.php b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
index 8b27d7cd..04d6dde9 100644
--- a/resources/themes/architect/views/layouts/partials/topmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
@@ -38,7 +38,7 @@
 						<span></span>
 						<div id="searching" class="d-none"><i class="fas fa-fw fa-spinner fa-pulse text-light"></i></div>
 					</button>
-					<div id="search_results" style="height: 300px; overflow: scroll"></div>
+					<div id="search_results" class="overflow-scroll" style="height: 300px;"></div>
 				</div>
 				<button class="btn-close"></button>
 			</div>
@@ -139,7 +139,7 @@
 							<div class="btn-group">
 								<a data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="p-0 btn">
 									<i class="fas fa-angle-down ms-2 opacity-8"></i>
-									<img width="35" height="35" class="rounded-circle" src="{{ url('user/image') }}" alt="" style="background-color: #eee;padding: 2px;">
+									<img width="35" height="35" class="rounded-circle p-1 bg-light" src="{{ url('user/image') }}" alt="">
 								</a>
 								<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
 									@if ($user->exists)
diff --git a/resources/views/components/alert/attribute_tags_cant_manage.blade.php b/resources/views/components/alert/attribute_tags_cant_manage.blade.php
index 6c61b07b..ac328768 100644
--- a/resources/views/components/alert/attribute_tags_cant_manage.blade.php
+++ b/resources/views/components/alert/attribute_tags_cant_manage.blade.php
@@ -1,4 +1,4 @@
-<div class="alert alert-danger p-0" style="font-size: .80em;">
+<div class="alert alert-danger font-size-sm p-0">
 	<table class="table table-borderless table-danger p-0 m-0">
 		<tr>
 			<td class="align-top" style="width: 5%;"><i class="fas fa-fw fa-2x fa-exclamation-triangle"></i></td>
diff --git a/resources/views/components/attribute-type.blade.php b/resources/views/components/attribute-type.blade.php
index e4e492ca..9cc7410f 100644
--- a/resources/views/components/attribute-type.blade.php
+++ b/resources/views/components/attribute-type.blade.php
@@ -1,23 +1,53 @@
+@use(App\Ldap\Entry)
+
 <div class="row pb-3">
-	<div class="col-12 col-sm-1 col-md-2"></div>
-	<div class="col-12 col-sm-10 col-md-8">
+	<div class="col-12 offset-lg-1 col-lg-10">
 		<div class="row">
-			<div class="col-12 bg-light text-dark p-2">
-				<strong><abbr title="{{ $o->description }}">{{ $o->name }}</abbr></strong>
-				<!-- Attribute Hints -->
-				@if($updated)
-					<span class="float-end small text-success ms-2" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip-success" title="@lang('Updated')"><i class="fas fa-fw fa-marker"></i> </span>
-				@endif
-				<span class="float-end small">
-					@foreach($o->hints as $name => $description)
-						@if ($loop->index),@endif
-						<abbr title="{{ $description }}">{{ $name }}</abbr>
-					@endforeach
+			<div class="col-12 bg-light text-dark p-2 rounded-2">
+				<span class="d-flex justify-content-between">
+					<span style="width: 20em;">
+						<strong class="align-middle"><abbr title="{{ $o->description }}">{{ $o->name }}</abbr></strong>
+						@if($o->hints->count())
+							<sup>
+								[
+								@foreach($o->hints as $name => $description)
+									@if ($loop->index),@endif
+									<abbr title="{{ $description }}">{{ $name }}</abbr>
+								@endforeach
+								]
+							</sup>
+						@endif
+
+						<!-- Attribute Hints -->
+						@if($updated)
+							<span class=" small text-success ms-2" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip-success" title="@lang('Updated')"><i class="fas fa-fw fa-marker"></i> </span>
+						@endif
+					</span>
+
+					<div role="group" class="btn-group-sm nav btn-group">
+						@if((! $o->no_attr_tags) && ($has_default=$o->langtags->contains(Entry::TAG_NOTAG)))
+							<span data-bs-toggle="tab" href="#langtag-{{ $o->name_lc }}-{{ Entry::TAG_NOTAG }}" @class(['btn','btn-outline-light','border-dark-subtle','active','addable d-none'=>$o->langtags->count() === 1])>
+								<i class="fas fa-fw fa-border-none" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" aria-label="No Lang Tag" data-bs-original-title="No Lang Tag"></i>
+							</span>
+						@endif
+
+						@if((! $o->no_attr_tags) && (! $o->is_rdn))
+							<span data-bs-toggle="tab" href="#langtag-{{ $o->name_lc }}-+" class="bg-primary-subtle btn btn-outline-primary border-primary addable d-none">
+								<i class="fas fa-fw fa-plus text-dark" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" aria-label="Add Lang Tag" data-bs-original-title="Add Lang Tag"></i>
+							</span>
+						@endif
+
+						@foreach(($langtags=$o->langtags->filter(fn($item)=>$item !== Entry::TAG_NOTAG)) as $langtag)
+							<span data-bs-toggle="tab" href="#langtag-{{ $o->name_lc }}-{{ $langtag }}" @class(['btn','btn-outline-light','border-dark-subtle','active'=>(! isset($has_default)) || (! $has_default) ])>
+								<span class="f16" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" aria-label="{{ $langtag }}" data-bs-original-title="{{ ($x=preg_replace('/'.Entry::LANG_TAG_PREFIX.'/','',$langtag)) }}"><i class="flag {{ $x }}"></i></span>
+							</span>
+						@endforeach
+					</div>
 				</span>
 			</div>
 		</div>
 
-		<x-attribute :o="$o" :edit="$edit" :new="$new" :langtag="$langtag" :updated="$updated"/>
+		<x-attribute :o="$o" :edit="$edit" :new="$new" :updated="$updated"/>
 	</div>
 </div>
 
diff --git a/resources/views/components/attribute.blade.php b/resources/views/components/attribute.blade.php
index b8f1a143..ad5572b4 100644
--- a/resources/views/components/attribute.blade.php
+++ b/resources/views/components/attribute.blade.php
@@ -1,21 +1,36 @@
 <!-- $o=Attribute::class -->
 <x-attribute.layout :edit="$edit=($edit ?? FALSE)" :new="$new=($new ?? FALSE)" :o="$o">
 	<div class="col-12">
-		@foreach(Arr::get(old($o->name_lc,[$langtag=>$new ? [NULL] : $o->tagValues($langtag)]),$langtag,[]) as $key => $value)
-			@if($edit && (! $o->is_rdn))
-				<div class="input-group has-validation">
-					<input type="text" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! ($tv=$o->tagValuesOld($langtag))->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}" placeholder="{{ ! is_null($x=$tv->get($loop->index)) ? $x : '['.__('NEW').']' }}" @readonly(! $new) @disabled($o->isDynamic())>
+		<div class="tab-content">
+			@foreach($o->langtags as $langtag)
+				<span @class(['tab-pane','active'=>$loop->index === 0]) id="langtag-{{ $o->name_lc }}-{{ $langtag }}" role="tabpanel">
+					@foreach(Arr::get(old($o->name_lc,[$langtag=>$new ? [NULL] : $o->tagValues($langtag)]),$langtag,[]) as $key => $value)
+						@if($edit && (! $o->is_rdn))
+							<div class="input-group has-validation">
+								<input type="text" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! ($tv=$o->tagValuesOld($langtag))->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}" placeholder="{{ ! is_null($x=$tv->get($loop->index)) ? $x : '['.__('NEW').']' }}" @readonly(! $new) @disabled($o->isDynamic())>
 
-					<div class="invalid-feedback pb-2">
-						@if($e)
-							{{ join('|',$e) }}
+								<div class="invalid-feedback pb-2">
+									@if($e)
+										{{ join('|',$e) }}
+									@endif
+								</div>
+							</div>
+
+						@else
+							<input type="text" @class(['form-control','mb-1','bg-success-subtle'=>$updated]) value="{{ $value }}" disabled>
 						@endif
-					</div>
-				</div>
+					@endforeach
+				</span>
+			@endforeach
 
-			@else
-				<input type="text" @class(['form-control','mb-1','bg-success-subtle'=>$updated]) value="{{ $value }}" disabled>
+			@if($edit && (! $o->is_rdn))
+				<span @class(['tab-pane']) id="langtag-{{ $o->name_lc }}-+" role="tabpanel">
+					<span class="d-flex font-size-sm alert alert-warning p-2">
+						It is not possible to create new language tags at the moment. This functionality should come soon.<br>
+						You can create them with an LDIF import though.
+					</span>
+				</span>
 			@endif
-		@endforeach
+		</div>
 	</div>
 </x-attribute.layout>
\ No newline at end of file
diff --git a/resources/views/components/attribute/binary/jpegphoto.blade.php b/resources/views/components/attribute/binary/jpegphoto.blade.php
index 1f73b222..109988e7 100644
--- a/resources/views/components/attribute/binary/jpegphoto.blade.php
+++ b/resources/views/components/attribute/binary/jpegphoto.blade.php
@@ -1,3 +1,5 @@
+@use(App\Ldap\Entry)
+
 <!-- @todo We are not handling redirect backs yet with updated photos -->
 <!-- $o=Binary\JpegPhoto::class -->
 <x-attribute.layout :edit="$edit" :new="$new" :o="$o">
@@ -8,8 +10,8 @@
 					@case('image/jpeg')
 					@default
 						<td>
-							<input type="hidden" name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ md5($value) }}">
-							<img alt="{{ $o->dn }}" @class(['border','rounded','p-2','m-0','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'bg-success-subtle'=>$updated]) src="data:{{ $x }};base64, {{ base64_encode($value) }}" />
+							<input type="hidden" name="{{ $o->name_lc }}[{{ Entry::TAG_NOTAG }}][]" value="{{ md5($value) }}">
+							<img alt="{{ $o->dn }}" @class(['border','rounded','p-2','m-0','is-invalid'=>($e=$errors->get($o->name_lc.'.'.Entry::TAG_NOTAG.'.'.$loop->index)),'bg-success-subtle'=>$updated]) src="data:{{ $x }};base64, {{ base64_encode($value) }}" />
 
 							@if($edit)
 								<br>
diff --git a/resources/views/components/attribute/krbprincipalkey.blade.php b/resources/views/components/attribute/krbprincipalkey.blade.php
index 945752f8..a6693155 100644
--- a/resources/views/components/attribute/krbprincipalkey.blade.php
+++ b/resources/views/components/attribute/krbprincipalkey.blade.php
@@ -1,18 +1,20 @@
 <!-- $o=KrbPrincipleKey::class -->
 <x-attribute.layout :edit="$edit" :new="$new" :o="$o">
-	@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
-		@if($edit)
-			<div class="input-group has-validation mb-3">
-				<input type="password" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! $o->tagValuesOld($langtag)->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ Arr::get(old($o->name_lc),$langtag.'.'.$loop->index,$value ? md5($value) : '') }}" @readonly(! $new)>
+	@foreach($o->langtags as $langtag)
+		@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
+			@if($edit)
+				<div class="input-group has-validation mb-3">
+					<input type="password" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! $o->tagValuesOld($langtag)->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ Arr::get(old($o->name_lc),$langtag.'.'.$loop->index,$value ? md5($value) : '') }}" @readonly(! $new)>
 
-				<div class="invalid-feedback pb-2">
-					@if($e)
-						{{ join('|',$e) }}
-					@endif
+					<div class="invalid-feedback pb-2">
+						@if($e)
+							{{ join('|',$e) }}
+						@endif
+					</div>
 				</div>
-			</div>
-		@else
-			{{ $o->render_item_old($langtag.'.'.$key) }}
-		@endif
+			@else
+				{{ $o->render_item_old($langtag.'.'.$key) }}
+			@endif
+		@endforeach
 	@endforeach
 </x-attribute.layout>
\ No newline at end of file
diff --git a/resources/views/components/attribute/krbticketflags.blade.php b/resources/views/components/attribute/krbticketflags.blade.php
index 6f57ede1..a1b60174 100644
--- a/resources/views/components/attribute/krbticketflags.blade.php
+++ b/resources/views/components/attribute/krbticketflags.blade.php
@@ -1,22 +1,24 @@
 <!-- $o=KrbTicketFlags::class -->
 <x-attribute.layout :edit="$edit" :new="$new" :o="$o">
-	@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
-		@if($edit)
-			<div id="32"></div>
-			<div id="16"></div>
+	@foreach($o->langtags as $langtag)
+		@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
+			@if($edit)
+				<div id="32"></div>
+				<div id="16"></div>
 
-			<div class="input-group has-validation mb-3">
-				<input type="hidden" name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}" @readonly(true)>
+				<div class="input-group has-validation mb-3">
+					<input type="hidden" name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}" @readonly(true)>
 
-				<div class="invalid-feedback pb-2">
-					@if($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index))
-						{{ join('|',$e) }}
-					@endif
+					<div class="invalid-feedback pb-2">
+						@if($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index))
+							{{ join('|',$e) }}
+						@endif
+					</div>
 				</div>
-			</div>
-		@else
-			{{ $o->render_item_old($langtag.'.'.$key) }}
-		@endif
+			@else
+				{{ $o->render_item_old($langtag.'.'.$key) }}
+			@endif
+		@endforeach
 	@endforeach
 </x-attribute.layout>
 
@@ -48,7 +50,7 @@
 			$('div#32').append(binary(31,16));
 			$('div#16').append(binary(15,0));
 
-			$('attribute#krbTicketFlags').find('i')
+			$('attribute#krbticketflags').find('i')
 				.on('click',function() {
 					var item = $(this);
 					if ($('form#dn-edit').attr('readonly'))
@@ -91,7 +93,7 @@
 						item.data('old',null);
 					}
 
-					$('attribute#krbTicketFlags').find('input').val(value);
+					$('attribute#krbticketflags').find('input').val(value);
 				});
 		}
 
@@ -102,7 +104,7 @@
 		} else {
 			krbticketflags();
 
-			$('attribute#krbTicketFlags').find('i')
+			$('attribute#krbticketflags').find('i')
 				.tooltip();
 		}
 	</script>
diff --git a/resources/views/components/attribute/layout.blade.php b/resources/views/components/attribute/layout.blade.php
index 99d5b436..395193c5 100644
--- a/resources/views/components/attribute/layout.blade.php
+++ b/resources/views/components/attribute/layout.blade.php
@@ -1,7 +1,7 @@
 <div class="row pt-2">
 	<div @class(['col-1','d-none'=>(! $edit) && (! ($detail ?? FALSE))])></div>
 	<div class="col-10">
-		<attribute id="{{ $o->name }}">
+		<attribute id="{{ $o->name_lc }}">
 			{{ $slot }}
 		</attribute>
 
diff --git a/resources/views/components/attribute/objectclass.blade.php b/resources/views/components/attribute/objectclass.blade.php
index 41b6ff97..3dacc7e4 100644
--- a/resources/views/components/attribute/objectclass.blade.php
+++ b/resources/views/components/attribute/objectclass.blade.php
@@ -1,15 +1,17 @@
 <!-- $o=Attribute/ObjectClass::class -->
 <x-attribute.layout :edit="$edit" :new="$new" :o="$o">
-	@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
-		@if($edit)
-			<x-attribute.widget.objectclass :o="$o" :edit="$edit" :new="$new" :langtag="$langtag" :updated="$updated" :value="$value" :loop="$loop" />
-		@else
-			{{ $o->render_item_old($key) }}
-			@if ($o->isStructural($value))
-				<input type="hidden" name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}">
-				<span class="float-end">@lang('structural')</span>
+	@foreach($o->langtags as $langtag)
+		@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
+			@if($edit)
+				<x-attribute.widget.objectclass :o="$o" :edit="$edit" :new="$new" :langtag="$langtag" :updated="$updated" :value="$value" :loop="$loop" />
+			@else
+				{{ $o->render_item_old($key) }}
+				@if ($o->isStructural($value))
+					<input type="hidden" name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ $value }}">
+					<span class="float-end">@lang('structural')</span>
+				@endif
+				<br>
 			@endif
-			<br>
-		@endif
+		@endforeach
 	@endforeach
 </x-attribute.layout>
\ No newline at end of file
diff --git a/resources/views/components/attribute/password.blade.php b/resources/views/components/attribute/password.blade.php
index 4d26212f..22b1e799 100644
--- a/resources/views/components/attribute/password.blade.php
+++ b/resources/views/components/attribute/password.blade.php
@@ -1,20 +1,22 @@
 <!-- $o=Password::class -->
 <x-attribute.layout :edit="$edit" :new="$new" :o="$o">
-	@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
-		@if($edit)
-			<div class="input-group has-validation mb-3">
-				<x-form.select id="userpassword_hash_{{$loop->index}}" name="userpassword_hash[{{ $langtag }}][]" :value="$o->hash($new ? '' : $value)->id()" :options="$helpers" allowclear="false" :disabled="! $new"/>
-				<input type="password" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! $o->tagValuesOld($langtag)->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ Arr::get(old($o->name_lc),$langtag.'.'.$loop->index,$value ? md5($value) : '') }}" @readonly(! $new)>
+	@foreach($o->langtags as $langtag)
+		@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
+			@if($edit)
+				<div class="input-group has-validation mb-3">
+					<x-form.select id="userpassword_hash_{{$loop->index}}" name="userpassword_hash[{{ $langtag }}][]" :value="$o->hash($new ? '' : $value)->id()" :options="$helpers" allowclear="false" :disabled="! $new"/>
+					<input type="password" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! $o->tagValuesOld($langtag)->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ Arr::get(old($o->name_lc),$langtag.'.'.$loop->index,$value ? md5($value) : '') }}" @readonly(! $new)>
 
-				<div class="invalid-feedback pb-2">
-					@if($e)
-						{{ join('|',$e) }}
-					@endif
+					<div class="invalid-feedback pb-2">
+						@if($e)
+							{{ join('|',$e) }}
+						@endif
+					</div>
 				</div>
-			</div>
-		@else
-			{{ $o->render_item_old($langtag.'.'.$key) }}
-		@endif
+			@else
+				{{ $o->render_item_old($langtag.'.'.$key) }}
+			@endif
+		@endforeach
 	@endforeach
 </x-attribute.layout>
 
diff --git a/resources/views/components/attribute/widget/options.blade.php b/resources/views/components/attribute/widget/options.blade.php
index 345e4587..cd903f31 100644
--- a/resources/views/components/attribute/widget/options.blade.php
+++ b/resources/views/components/attribute/widget/options.blade.php
@@ -11,11 +11,11 @@
 		@switch(get_class($o))
 			@case(Certificate::class)
 			@case(CertificateList::class)
-				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name }}-replace" disabled><i class="fas fa-fw fa-certificate"></i> @lang('Replace')</span>
+				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name_lc }}-replace" disabled><i class="fas fa-fw fa-certificate"></i> @lang('Replace')</span>
 				@section('page-scripts')
 					<script type="text/javascript">
 							$(document).ready(function() {
-								$('#{{ $o->name }}-replace.addable').click(function(e) {
+								$('attribute#{{ $o->name_lc }}-replace.addable').click(function(e) {
 									alert('Sorry, not implemented yet');
 									e.preventDefault();
 									return false;
@@ -55,7 +55,7 @@
 							var rendered = false;
 							var newadded = [];
 
-							var oc = $('attribute#objectClass input[type=text]')
+							var oc = $('attribute#objectclass input[type=text]')
 								.map((key,item)=>{return $(item).val()}).toArray();
 
 							if (newadded.length)
@@ -81,7 +81,7 @@
 										},
 										cache: false,
 										success: function(data) {
-											$('#{{ $o->name }}').append(data);
+											$('attribute#{{ $o->name_lc }}').append(data);
 										},
 										error: function(e) {
 											if (e.status !== 412)
@@ -98,13 +98,13 @@
 											// Render any must attributes
 											if (data.must.length) {
 												data.must.forEach(function(item) {
-													if ($('attribute#'+item).length)
+													if ($('attribute#'+item.toLowerCase()).length)
 														return;
 
 													// Add attribute to the page
 													$.ajax({
 														method: 'POST',
-														url: '{{ url('entry/attr/add') }}/'+item,
+														url: '{{ url('entry/attr/add') }}/'+item.toLowerCase(),
 														data: {
 															value: item,
 															objectclasses: oc,
@@ -237,11 +237,11 @@
 				@break
 
 			@case(JpegPhoto::class)
-				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name }}-upload" disabled><i class="fas fa-fw fa-file-arrow-up"></i> @lang('Upload JpegPhoto')</span>
+				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name_lc }}-upload" disabled><i class="fas fa-fw fa-file-arrow-up"></i> @lang('Upload JpegPhoto')</span>
 				@section('page-scripts')
 					<script type="text/javascript">
 							$(document).ready(function() {
-								$('#{{ $o->name }}-upload.addable').click(function(e) {
+								$('#{{ $o->name_lc }}-upload.addable').click(function(e) {
 									alert('Sorry, not implemented yet');
 									e.preventDefault();
 									return false;
@@ -256,7 +256,7 @@
 				@if($o->isDynamic()) @break @endif
 				@php($clone=TRUE)
 				@if($o->values_old->count())
-					<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) id="{{ $o->name }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
+					<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-attribute="{{ $o->name }}" id="{{ $o->name_lc }}-addnew"><i class="fas fa-fw fa-plus"></i> @lang('Add Value')</span>
 				@endif
 
 				@section('page-scripts')
@@ -264,13 +264,16 @@
 						<script type="text/javascript">
 							$(document).ready(function() {
 								// Create a new entry when Add Value clicked
-								$('#{{ $o->name }}-addnew.addable').click(function (item) {
-									var cln = $(this).parent().parent().find('input:last').parent().clone();
-									cln.find('input:last')
+								$('#{{ $o->name_lc }}-addnew.addable').click(function(item) {
+									var attribute = $(this).data('attribute');
+									var active = $('attribute[id='+attribute+']').find('.tab-pane.active');
+
+									active.find('input:last')
+										.clone()
 										.attr('value','')
-										.attr('placeholder', '[@lang('NEW')]')
+										.attr('placeholder','[@lang('NEW')]')
 										.addClass('border-focus')
-										.appendTo('#'+item.currentTarget.id.replace('-addnew',''));
+										.appendTo(active);
 								});
 							});
 						</script>
diff --git a/resources/views/components/form/disabled/datetime.blade.php b/resources/views/components/form/disabled/datetime.blade.php
index 1a5a0460..e5611e5b 100644
--- a/resources/views/components/form/disabled/datetime.blade.php
+++ b/resources/views/components/form/disabled/datetime.blade.php
@@ -1,8 +1,10 @@
 <!-- $o=Attribute::class -->
 <x-attribute.layout :edit="false" :new="false" :o="$o" :detail="true">
-	@foreach(Arr::get(old($o->name_lc,[$langtag=>$o->tagValues($langtag)]),$langtag,[]) as $value)
-		<div class="input-group">
-			<input type="text" class="form-control mb-1" value="{{ \Carbon\Carbon::createFromTimestamp(strtotime($value))->format(config('pla.datetime_format','Y-m-d H:i:s')) }}" disabled>
-		</div>
+	@foreach($o->langtags as $langtag)
+		@foreach(Arr::get(old($o->name_lc,[$langtag=>$o->tagValues($langtag)]),$langtag,[]) as $value)
+			<div class="input-group">
+				<input type="text" class="form-control mb-1" value="{{ \Carbon\Carbon::createFromTimestamp(strtotime($value))->format(config('pla.datetime_format','Y-m-d H:i:s')) }}" disabled>
+			</div>
+		@endforeach
 	@endforeach
 </x-attribute.layout>
\ No newline at end of file
diff --git a/resources/views/components/form/disabled/input.blade.php b/resources/views/components/form/disabled/input.blade.php
index 8722b243..fbe20777 100644
--- a/resources/views/components/form/disabled/input.blade.php
+++ b/resources/views/components/form/disabled/input.blade.php
@@ -1,8 +1,10 @@
 <!-- $o=Attribute::class -->
 <x-attribute.layout :edit="false" :new="false" :o="$o" :detail="true">
-	@foreach(Arr::get(old($o->name_lc,[$langtag=>$o->tagValues($langtag)]),$langtag,[]) as $value)
-		<div class="input-group">
-			<input type="text" class="form-control mb-1" value="{{ $value }}" disabled>
-		</div>
+	@foreach($o->langtags as $langtag)
+		@foreach(Arr::get(old($o->name_lc,[$langtag=>$o->tagValues($langtag)]),$langtag,[]) as $value)
+			<div class="input-group">
+				<input type="text" class="form-control mb-1" value="{{ $value }}" disabled>
+			</div>
+		@endforeach
 	@endforeach
 </x-attribute.layout>
\ No newline at end of file
diff --git a/resources/views/components/success.blade.php b/resources/views/components/success.blade.php
index a7388478..6598a290 100644
--- a/resources/views/components/success.blade.php
+++ b/resources/views/components/success.blade.php
@@ -2,7 +2,7 @@
 	<div class="alert alert-success">
 		<h4 class="alert-heading"><i class="fas fa-fw fa-thumbs-up"></i> Success!</h4>
 		<hr>
-		<ul style="list-style-type: square;">
+		<ul class="square">
 			@foreach (session()->get('success') as $item)
 				<li>{{ $item }}</li>
 			@endforeach
diff --git a/resources/views/components/syntax/certificate.blade.php b/resources/views/components/syntax/certificate.blade.php
index ae9257de..48f9fe4d 100644
--- a/resources/views/components/syntax/certificate.blade.php
+++ b/resources/views/components/syntax/certificate.blade.php
@@ -8,10 +8,10 @@
 			<input type="hidden" name="name={{ $o->name_lc }}[binary][]" value="{{ md5($value) }}">
 
 			<div class="input-group has-validation mb-3">
-				<textarea class="form-control mb-1 font-monospace" rows="{{ count(explode("\n",$x=$o->certificate())) }}" style="overflow: hidden; font-size: 90%;" disabled>{{ $x }}</textarea>
+				<textarea class="form-control mb-1 font-size-md font-monospace overflow-hidden" rows="{{ count(explode("\n",$x=$o->certificate())) }}" disabled>{{ $x }}</textarea>
 
 				<div class="invalid-feedback pb-2">
-					@if($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index))
+					@if($e=$errors->get($o->name_lc.'.binary.'.$loop->index))
 						{{ join('|',$e) }}
 					@endif
 				</div>
diff --git a/resources/views/fragment/dn/add_attr.blade.php b/resources/views/fragment/dn/add_attr.blade.php
index 852a1960..7847644d 100644
--- a/resources/views/fragment/dn/add_attr.blade.php
+++ b/resources/views/fragment/dn/add_attr.blade.php
@@ -1,12 +1,13 @@
 <div id="newattrs"></div>
 
+<hr class="opacity-05">
+
 <!-- Add new attributes -->
 <div class="row">
-	<div class="col-12 col-sm-1 col-md-2"></div>
-	<div class="col-12 col-sm-10 col-md-8">
-		<div class="d-none" id="newattr-select">
+	<div class="col-12 offset-lg-1 col-lg-10">
+		<div class="d-none round" id="newattr-select">
 			<div class="row">
-				<div class="col-12 bg-dark text-light p-2">
+				<div class="col-12 bg-dark text-light p-2 rounded-2">
 					<i class="fas fa-plus-circle"></i> Add New Attribute
 				</div>
 			</div>
diff --git a/resources/views/fragment/dn/header.blade.php b/resources/views/fragment/dn/header.blade.php
index 3611d788..344e0977 100644
--- a/resources/views/fragment/dn/header.blade.php
+++ b/resources/views/fragment/dn/header.blade.php
@@ -1,3 +1,5 @@
+@use(App\Ldap\Entry)
+
 <table class="table table-borderless">
 	<tr class="border-bottom line-height-2">
 		<td class="p-1 pt-0" rowspan="2">
@@ -6,7 +8,7 @@
 		<td class="text-end align-bottom pb-0 mb-0 pt-2 pe-3 {{ $x ? 'ps-3' : '' }}"><strong class="user-select-all">{{ $o->getDn() }}</strong></td>
 	</tr>
 	<tr>
-		<td class="align-bottom" style="font-size: 55%" colspan="2">
+		<td class="align-bottom font-size-xs" colspan="2">
 			<table class="table table-condensed table-borderless w-100">
 				<tr class="mt-1">
 					<td class="p-0 pe-2">Created</td>
@@ -26,10 +28,17 @@
 						<x-attribute :o="$o->getObject('entryuuid')"/>
 					</th>
 				</tr>
-				@if($langtags->count())
+				<!-- It is assumed that langtags contains at least Entry::TAG_NOTAG -->
+				@if(($x=$o->getLangTags()
+					->flatMap(fn($item)=>$item->values())
+					->unique()
+					->sort()
+					->filter(fn($item)=>($item !== Entry::TAG_NOTAG))
+					->map(fn($item)=>preg_replace('/'.Entry::LANG_TAG_PREFIX.'/','',$item)))
+					->count())
 					<tr class="mt-1">
 						<td class="p-0 pe-2">Tags</td>
-						<th class="p-0">{{ $langtags->join(', ') }}</th>
+						<th class="p-0">{{ $x->join(', ') }}</th>
 					</tr>
 				@endif
 			</table>
diff --git a/resources/views/fragment/schema/objectclasses.blade.php b/resources/views/fragment/schema/objectclasses.blade.php
index 2da4fed1..a941f295 100644
--- a/resources/views/fragment/schema/objectclasses.blade.php
+++ b/resources/views/fragment/schema/objectclasses.blade.php
@@ -77,7 +77,7 @@
 								<tbody>
 								<tr>
 									<td>
-										<ul class="ps-3" style="list-style-type: square;">
+										<ul class="ps-3 square">
 											@foreach($o->getMustAttrs(TRUE) as $oo)
 												<li>{{ $oo->name }} @if($oo->source !== $o->name)[<strong><a class="objectclass" id="{{ strtolower($oo->source) }}" href="#{{ strtolower($oo->source) }}">{{ $oo->source }}</a></strong>]@endif</li>
 											@endforeach
@@ -99,7 +99,7 @@
 								<tbody>
 								<tr>
 									<td>
-										<ul class="ps-3" style="list-style-type: square;">
+										<ul class="ps-3 square">
 											@foreach($o->getMayAttrs(TRUE) as $oo)
 												<li>{{ $oo->name }} @if($oo->source !== $o->name)[<strong><a class="objectclass" id="{{ strtolower($oo->source) }}" href="#{{ strtolower($oo->source) }}">{{ $oo->source }}</a></strong>]@endif</li>
 											@endforeach
diff --git a/resources/views/frames/create.blade.php b/resources/views/frames/create.blade.php
index c90449f7..f03d485f 100644
--- a/resources/views/frames/create.blade.php
+++ b/resources/views/frames/create.blade.php
@@ -3,10 +3,7 @@
 @extends('layouts.dn')
 
 @section('page_title')
-	@include('fragment.dn.header',[
-		'o'=>($oo=$server->fetch(old('container',$container))),
-		'langtags'=>collect(),
-	])
+	@include('fragment.dn.header',['o'=>($oo=$server->fetch(old('container',$container)))])
 @endsection
 
 @section('page_status')
@@ -50,10 +47,10 @@
 								@break
 
 							@case(2)
-								<x-attribute-type :o="$o->getObject('rdn')" :edit="TRUE" :new="FALSE" :langtag="Entry::TAG_NOTAG" :updated="FALSE"/>
+								<x-attribute-type :o="$o->getObject('rdn')" :edit="TRUE" :new="FALSE" :updated="FALSE"/>
 
 								@foreach ($o->getVisibleAttributes() as $ao)
-									<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :langtag="Entry::TAG_NOTAG" :updated="FALSE"/>
+									<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :updated="FALSE"/>
 								@endforeach
 
 								@include('fragment.dn.add_attr')
@@ -94,7 +91,7 @@
 			});
 
 			// Our password type
-			$('attribute#userPassword .form-select').each(function() {
+			$('attribute#userpassword .form-select').each(function() {
 				$(this).prop('disabled',false);
 			})
 
@@ -107,7 +104,7 @@
 		$(document).ready(function() {
 			@if($step === 2)
 				$('#newattr').on('change',function(item) {
-					var oc = $('attribute#objectClass input[type=text]')
+					var oc = $('attribute#objectclass input[type=text]')
 						.map((key,item)=>{return $(item).val()}).toArray();
 
 					$.ajax({
diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index b8745a39..1cd7c513 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -1,15 +1,7 @@
-@use(App\Ldap\Entry)
-
 @extends('layouts.dn')
 
 @section('page_title')
-	@include('fragment.dn.header',[
-		'o'=>($o ?? $o=$server->fetch($dn)),
-		'langtags'=>($langtags=$o->getLangTags()
-			->flatMap(fn($item)=>$item->values())
-			->unique()
-			->sort())
-	])
+	@include('fragment.dn.header',['o'=>($o ?? $o=$server->fetch($dn))])
 @endsection
 
 @section('page_actions')
@@ -82,71 +74,52 @@
 				<div class="tab-content">
 					<!-- All Attributes -->
 					<div class="tab-pane active" id="attributes" role="tabpanel">
-						<form id="dn-edit" method="POST" class="needs-validation" action="{{ url('entry/update/pending') }}" novalidate readonly>
-							@csrf
-
-							<input type="hidden" name="dn" value="">
-							<div class="card-header border-bottom-0">
-								<div class="btn-actions-pane-right">
-									<div role="group" class="btn-group-sm nav btn-group">
-										@php
-											$langtags->prepend(Entry::TAG_NOTAG);
-											if (isset($page_actions) && $page_actions->get('edit'))
-												$langtags->push('+');
-										@endphp
-
-										@foreach($langtags as $tag)
-											<a data-bs-toggle="tab" href="#tab-lang-{{ $tag ?: '_default' }}" @class(['btn','btn-outline-light','border-dark-subtle','active'=>!$loop->index])>
-												@switch($tag)
-													@case(Entry::TAG_NOTAG)
-														<i class="fas fa-fw fa-border-none" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" title="@lang('No Lang Tag')"></i>
-														@break
-
-													@case('+')
-														<!-- @todo To implement -->
-														<i class="fas fa-fw fa-plus text-dark" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" title="@lang('Add Lang Tag')"></i>
-														@break
-
-													@default
-														<span class="f16" data-bs-toggle="tooltip" data-bs-custom-class="custom-tooltip" title="{{ strtoupper($tag) }}"><i class="flag {{ $tag }}"></i></span>
-												@endswitch
-											</a>
-										@endforeach
+						<div class="row pt-3">
+							<div class="col-12">
+								<div class="d-flex justify-content-center">
+									<div role="group" class="btn-group btn-group-sm nav pb-3">
+										<!-- It is assumed that the entry has atleast 1 template "default" -->
+										@if($o->templates->count() > 1)
+											@foreach($o->templates as $template => $name)
+												<span data-bs-toggle="tab" href="#template-{{$template}}" @class(['btn','btn-outline-focus','active'=>$loop->index === 0])>{{ $name }}</span>
+											@endforeach
+										@endif
 									</div>
 								</div>
-							</div>
 
-							<div class="card-body">
 								<div class="tab-content">
-									@php($up=(session()->pull('updated') ?: collect()))
-									@foreach($langtags as $tag)
-										<div class="tab-pane @if(! $loop->index) active @endif" id="tab-lang-{{ $tag ?: '_default' }}" role="tabpanel">
-											@switch($tag)
-												@case(Entry::TAG_NOTAG)
-													@foreach ($o->getVisibleAttributes($tag) as $ao)
-														<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :langtag="$tag" :updated="$up->contains($ao->name_lc)"/>
-													@endforeach
-													@break
+									@foreach($o->templates as $template => $name)
+										@switch($template)
+											@case('default')
+												<div @class(['tab-pane','active'=>$loop->index === 0]) id="template-{{$template}}" role="tabpanel">
+													<form id="dn-edit" method="POST" class="needs-validation" action="{{ url('entry/update/pending') }}" novalidate readonly>
+														@csrf
 
-												@case('+')
-													<div class="ms-auto mt-4 alert alert-warning p-2" style="max-width: 30em; font-size: 0.80em;">
-														It is not possible to create new language tags at the moment. This functionality should come soon.<br>
-														You can create them with an LDIF import though.
-													</div>
-													@break
+														<input type="hidden" name="dn" value="">
 
-												@default
-													@foreach ($o->getVisibleAttributes($langtag=sprintf('lang-%s',$tag)) as $ao)
-														<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :langtag="$langtag" :updated="$up->contains($ao->name_lc)"/>
-													@endforeach
-											@endswitch
-										</div>
+														<div class="card-body">
+															<div class="tab-content">
+																@php($up=(session()->pull('updated') ?: collect()))
+																@foreach($o->getVisibleAttributes() as $ao)
+																	<x-attribute-type :o="$ao" :edit="TRUE" :new="FALSE" :updated="$up->contains($ao->name_lc)"/>
+																@endforeach
+
+																@include('fragment.dn.add_attr')
+															</div>
+														</div>
+													</form>
+												</div>
+												@break
+
+											@default
+												<div @class(['tab-pane','active'=>$loop->index === 0]) id="template-{{$template}}" role="tabpanel">
+													<p>{{$name}}</p>
+												</div>
+										@endswitch
 									@endforeach
 								</div>
 							</div>
-
-							@include('fragment.dn.add_attr')
-						</form>
+						</div>
 
 						<div class="row d-none pt-3">
 							<div class="col-12 offset-sm-2 col-sm-4 col-lg-2">
@@ -158,8 +131,8 @@
 
 					<!-- Internal Attributes -->
 					<div class="tab-pane mt-3" id="internal" role="tabpanel">
-						@foreach ($o->getInternalAttributes() as $ao)
-							<x-attribute-type :o="$ao" :edit="FALSE" :new="FALSE" :langtag="Entry::TAG_NOTAG" :updated="FALSE"/>
+						@foreach($o->getInternalAttributes() as $ao)
+							<x-attribute-type :o="$ao" :edit="FALSE" :new="FALSE" :updated="FALSE"/>
 						@endforeach
 					</div>
 				</div>
@@ -201,7 +174,7 @@
 			});
 
 			// Our password type
-			$('attribute#userPassword .form-select').each(function() {
+			$('attribute#userpassword .form-select').each(function() {
 				$(this).prop('disabled',false);
 			})
 
@@ -230,7 +203,7 @@
 			});
 
 			$('#newattr').on('change',function(item) {
-				var oc = $('attribute#objectClass input[type=text]')
+				var oc = $('attribute#objectclass input[type=text]')
 					.map((key,item)=>{return $(item).val()}).toArray();
 
 				$.ajax({
@@ -278,7 +251,7 @@
 								if (e.status !== 412)
 									alert('That didnt work? Please try again....');
 							},
-						})
+						});
 						break;
 
 					case 'entry-export':
diff --git a/resources/views/frames/import.blade.php b/resources/views/frames/import.blade.php
index cb110b42..c93bd8de 100644
--- a/resources/views/frames/import.blade.php
+++ b/resources/views/frames/import.blade.php
@@ -3,7 +3,7 @@
 @section('page_title')
 	<table class="table table-borderless">
 		<tr>
-			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
+			<td><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
 			<td class="top text-start align-text-top p-2"><strong>@lang('LDIF Import')</strong><br><small>@lang('To Server') <strong>{{ $server->name }}</strong></small></td>
 		</tr>
 	</table>
diff --git a/resources/views/frames/import_result.blade.php b/resources/views/frames/import_result.blade.php
index 48641ef9..f5370673 100644
--- a/resources/views/frames/import_result.blade.php
+++ b/resources/views/frames/import_result.blade.php
@@ -1,7 +1,7 @@
 @section('page_title')
 	<table class="table table-borderless">
 		<tr>
-			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
+			<td><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
 			<td class="top text-start align-text-top p-0 pt-2"><strong>@lang('LDIF Import Result')</strong><br><small>@lang('To Server') <strong>{{ $server->name }}</strong></small></td>
 		</tr>
 	</table>
diff --git a/resources/views/frames/info.blade.php b/resources/views/frames/info.blade.php
index 003d0382..0c03ffd8 100644
--- a/resources/views/frames/info.blade.php
+++ b/resources/views/frames/info.blade.php
@@ -3,7 +3,7 @@
 @section('page_title')
 	<table class="table table-borderless">
 		<tr>
-			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-info"></i></div></td>
+			<td><div class="page-title-icon f32"><i class="fas fa-info"></i></div></td>
 			<td class="top text-end align-text-top p-2"><strong>@lang('Server Info')</strong><br><small>{{ $server->rootDSE()->entryuuid[0] ?? '' }}</small></td>
 		</tr>
 	</table>
diff --git a/resources/views/frames/schema.blade.php b/resources/views/frames/schema.blade.php
index 4cc3fcbb..83a5027c 100644
--- a/resources/views/frames/schema.blade.php
+++ b/resources/views/frames/schema.blade.php
@@ -3,7 +3,7 @@
 @section('page_title')
 	<table class="table table-borderless">
 		<tr>
-			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-fingerprint"></i></div></td>
+			<td><div class="page-title-icon f32"><i class="fas fa-fingerprint"></i></div></td>
 			<td class="top text-end align-text-top p-2"><strong>{{ $server->schemaDN() }}</strong></td>
 		</tr>
 	</table>
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 79cc3b14..52b58b11 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -1,12 +1,7 @@
 @extends('home')
 
 @section('page_title')
-	@include('fragment.dn.header',[
-		'langtags'=>($langtags=$o->getLangTags()
-			->flatMap(fn($item)=>$item->values())
-			->unique()
-			->sort())
-	])
+	@include('fragment.dn.header')
 @endsection
 
 @section('page_status')