diff --git a/.DS_Store b/.DS_Store
index 428a811..df053a6 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/src/.DS_Store b/src/.DS_Store
index 5008ddf..02f32ad 100644
Binary files a/src/.DS_Store and b/src/.DS_Store differ
diff --git a/src/auth/otpcomponent.js b/src/auth/otpcomponent.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/lock/lockmanager.js b/src/lock/lockmanager.js
index ac3fe06..f4e2067 100644
--- a/src/lock/lockmanager.js
+++ b/src/lock/lockmanager.js
@@ -20,7 +20,7 @@ export class LockManager {
     // Add a 'lock' event to the 'locks' stream
     logger.debug('Locking object:', object._id);
     try {
-      await etcdServer.setKey(`/${object.type}s/${object._id}/lock`, {
+      await etcdServer.setKey(`/locks/${object.type}s/${object._id}`, {
         ...object,
         locked: true
       });
@@ -34,7 +34,7 @@ export class LockManager {
 
   async unlockObject(object) {
     // Add an 'unlock' event to the 'locks' stream
-    const key = `/${object.type}s/${object._id}/lock`;
+    const key = `/locks/${object.type}s/${object._id}`;
     try {
       logger.debug('Checking user can unlock:', object._id);
 
@@ -56,7 +56,7 @@ export class LockManager {
     // Get the current lock status of an object and broadcast it
     logger.info('Getting lock status for object:', object._id);
     try {
-      const lockKey = `/${object.type}s/${object._id}/lock`;
+      const lockKey = `/locks/${object.type}s/${object._id}`;
       const lockValue = await etcdServer.getKey(lockKey);
 
       if (lockValue) {
@@ -87,7 +87,7 @@ export class LockManager {
       (key, value) => {
         const id = key.split('/').pop();
         logger.debug('Lock object event:', id);
-        this.socketManager.broadcast('notify_lock_update', {
+        this.socketClient.socket.emit('lockUpdate', {
           ...value,
           locked: true
         });
@@ -96,7 +96,7 @@ export class LockManager {
     etcdServer.onPrefixDeleteEvent('/locks', this.socketClient.id, key => {
       const id = key.split('/').pop();
       logger.debug('Unlock object event:', id);
-      this.socketManager.broadcast('notify_lock_update', {
+      this.socketClient.socket.emit('lockUpdate', {
         _id: id,
         locked: false
       });
diff --git a/src/templates/assets/basetemplate.ejs b/src/templates/assets/basetemplate.ejs
index 3b47e0b..63d32ac 100644
--- a/src/templates/assets/basetemplate.ejs
+++ b/src/templates/assets/basetemplate.ejs
@@ -15,14 +15,18 @@
     </style>
     <style>
       body {
-        min-width: calc(<%= width || '50mm' %> + 100px);
-        min-height: calc(<%= height || '50mm' %> + 100px);
+        min-width: calc((<%= width || '50mm' %> * <%= scale || '1' %>) + 100px);
+        min-height: calc(
+          (<%= height || '50mm' %> * <%= scale || '1' %>) + 100px
+        );
       }
 
       .previewContainer {
         transform: scale(<%= scale || '1' %>);
-        min-width: calc(<%= width || '50mm' %> + 100px);
-        min-height: calc(<%= height || '50mm' %> + 100px);
+        min-width: calc((<%= width || '50mm' %> + 100px) * <%= scale || '1' %>);
+        min-height: calc(
+          (<%= height || '50mm' %> + 100px) * <%= scale || '1' %>
+        );
       }
       .previewDocument {
         width: <%= width || '50mm' %>;
diff --git a/src/templates/assets/styles.css b/src/templates/assets/styles.css
index d92d946..02af77f 100644
--- a/src/templates/assets/styles.css
+++ b/src/templates/assets/styles.css
@@ -11,6 +11,7 @@ body {
   display: flex;
   justify-content: center; /* Horizontal center */
   align-items: center; /* Vertical center */
+  transform-origin: center center;
 }
 .previewDocument {
   background: #ffffff;
@@ -71,3 +72,8 @@ h4.documentTitle {
   text-transform: uppercase;
   font-weight: 700;
 }
+
+.documentBarcode {
+  width: 100% !important;
+  height: 100% !important;
+}
diff --git a/src/templates/templatemanager.js b/src/templates/templatemanager.js
index d047a0d..2061312 100644
--- a/src/templates/templatemanager.js
+++ b/src/templates/templatemanager.js
@@ -225,6 +225,7 @@ export class TemplateManager {
         async: true,
         ...options
       };
+      logger.debug('Rendering template:', id);
 
       const documentTemplate = await getObject({
         model: documentTemplateModel,