diff --git a/templates/base.html b/templates/base.html
index 5398ab2..acb0fe3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -184,20 +184,21 @@
                                     </label>
                                 </div>
                             </div>
-                            <div class="form-group">
-                                <label for="client_public_key" class="control-label">
-                                    Public Key
-                                </label>
-                                <input type="text" class="form-control" id="client_public_key" 
-                                    name="client_public_key" placeholder="Autogenerated (insecure)">
-                            </div>
-                            <div class="form-group">
-                                <label for="client_preshared_key" class="control-label">
-                                    Preshared Key
-                                </label>
-                                <input type="text" class="form-control" id="client_preshared_key" 
-                                    name="client_preshared_key" placeholder="Autogenerated">
-                            </div>
+                            <details>
+                                <summary>Public and Preshared Keys</summary>
+                                <div class="form-group" style="margin-top: 1rem">
+                                    <label for="client_public_key" class="control-label">
+                                        Public Key
+                                    </label>
+                                    <input type="text" class="form-control" id="client_public_key" name="client_public_key" placeholder="Autogenerated (insecure)" aria-invalid="false">
+                                </div>
+                                <div class="form-group">
+                                    <label for="client_preshared_key" class="control-label">
+                                        Preshared Key
+                                    </label>
+                                    <input type="text" class="form-control" id="client_preshared_key" name="client_preshared_key" placeholder="Autogenerated">
+                                </div>
+                            </details>
                         </div>
                         <div class="modal-footer justify-content-between">
                             <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>