diff --git a/templates/internal/admin/assign-supervisor.html.twig b/templates/internal/admin/assign-supervisor.html.twig
index 4c9f2fa..56d0b34 100644
--- a/templates/internal/admin/assign-supervisor.html.twig
+++ b/templates/internal/admin/assign-supervisor.html.twig
@@ -25,7 +25,7 @@
 									<div class='input-group input-group-outline mb-3 is-filled'>
 										<label for='user_form_job' class='form-label'>Job</label>
 										<select name='{{ field_name(form.supervisor) }}' id='user_form_supervisor' class='form-control'>
-											<option value=''></option>
+											<option value=''>-- Select Supervisor --</option>
 											{% for s in supervisors %}
 												<option value='{{ s.id }}' {% if user.supervisor and user.supervisor.id == s.id %} selected="selected" {% endif %}>{{ s.name }}</option>
 											{% endfor %}
diff --git a/templates/internal/cases/addresses/list-case-addresses.html.twig b/templates/internal/cases/addresses/list-case-addresses.html.twig
index 43b8bf5..d789116 100644
--- a/templates/internal/cases/addresses/list-case-addresses.html.twig
+++ b/templates/internal/cases/addresses/list-case-addresses.html.twig
@@ -102,10 +102,6 @@
 									<option value=''>-- Destination --</option>
 								</select>
 							</div>
-							<div class='input-group input-group-outline my-3'>
-								<input type='time' name='arrival' id='arrival'/>
-							</div>
-
 							<div class='input-group input-group-outline my-3'>
 								<input type='checkbox' name='case-mileage' id='case-mileage' value='1'/>
 								<label for='case-mileage' style='padding:5px;'>Case Mileage</label>
diff --git a/templates/internal/cases/members/documents/sign-member-doc.html.twig b/templates/internal/cases/members/documents/sign-member-doc.html.twig
index e50cdd5..9dd761b 100644
--- a/templates/internal/cases/members/documents/sign-member-doc.html.twig
+++ b/templates/internal/cases/members/documents/sign-member-doc.html.twig
@@ -17,26 +17,26 @@
                 }}
             </div>
 
-            <div class='row'>
-                <div class='col'>
-                    <div class='input-group input-group-outline mb-3'>
-                        {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').CLIENT_NAME) %}
-                        <input type='text' name='clientName' id='clientName' value='{{ doc.client.name }}'/>
-                        {% endif %}
+            {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').CLIENT_SIGNATURE) %}
+                <div class='row'>
+                    <div class='col'>
+                        <div class='input-group input-group-outline mb-3'>
+                            {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').CLIENT_NAME) %}
+                            <input type='text' name='clientName' id='clientName' value='{{ doc.client.name }}'/>
+                            {% endif %}
 
-                        {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').CLIENT_SIGNATURE) %}
-                        <button id='clearClientSignature'>Clear Signature</button><br />
-                        <canvas id='clientSignatureCanvas'></canvas>
-                        {% endif %}
+                            <button id='clearClientSignature'>Clear Signature</button><br />
+                            <canvas id='clientSignatureCanvas'></canvas>
+                        </div>
                     </div>
                 </div>
-            </div>
+            {% endif %}
 
-            {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').PROVIDER_SIGNATURE) %}
+            {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').PROVIDER_SIGNATURE) %}
             <div class='row'>
                 <div class='col'>
                     <div class='input-group input-group-outline mb-3'>
-                        {% if doc.document.inExtras(enum('App\\Enums\\DocumentExtras').PROVIDER_NAME) %}
+                        {% if doc.document.inExtras(enum('App\\Enums\\Company\\DocumentExtras').PROVIDER_NAME) %}
                         <input type='text' name='providerName' id='providerName' value='{{ doc.caseWorker.name }}'/>
                         {% endif %}
 
@@ -47,7 +47,8 @@
             </div>
             {% endif %}
 
-            <button type="submit" class="btn btn-primary">Complete</button>
+            <button type="submit" class="btn btn-primary">Complete</button>&nbsp;&nbsp;
+            <button type="button" class="btn btn-secondary" onclick='history.back()'>Back</button>
         </form>
     </div>
 {% endblock %}
@@ -55,7 +56,7 @@
 {% block page_js %}
 		<script src="https://cdn.jsdelivr.net/npm/signature_pad@5.0.4/dist/signature_pad.umd.min.js"></script>
 		<script type='text/javascript'>
-			window.onload = initializeSignatureBlocks;
+window.onload = initializeSignatureBlocks;
 var clientCanvas = document.getElementById('clientSignatureCanvas');
 var providerCanvas = document.getElementById('providerSignatureCanvas');
 var providerSaveSignature = JSON.parse('{{ caseWorkerSignature|raw }}');
@@ -100,10 +101,11 @@ function clearProviderSignature(e) {
 }
 
 function saveSignatureBlock() {
-document.getElementById('signature').value = JSON.stringify(pad.toData());
-
-return true;
+    document.getElementById('signature').value = JSON.stringify(pad.toData());
+    return true;
 }
+
+/** @todo add method to read container div and pass all HTML contents when submitting  */
 		</script>
 {% endblock %}