diff --git a/src/gui/client/certificates-window.lisp b/src/gui/client/certificates-window.lisp
index b644f3d..483772b 100644
--- a/src/gui/client/certificates-window.lisp
+++ b/src/gui/client/certificates-window.lisp
@@ -63,7 +63,8 @@
   (lambda ()
     (a:when-let* ((uri       (gui-mw:text-input-dialog certificate-frame
                                                        (_ "Information")
-                                                       (_ "Type the net address the certificate is valid for:")))
+                                                       (_ "Type the net address the certificate is valid for:")
+                                                       :text (strcat gemini-constants:+gemini-scheme+ "://")))
                   (cert-file (gui:get-open-file :initial-dir "."
                                                 :parent certificate-frame
                                                 :multiple nil
@@ -88,14 +89,18 @@
   (gui:with-modal-toplevel (toplevel :master master :title (_ "Certificates"))
     (gui:transient toplevel master)
     (let* ((table         (make-instance 'certificate-frame :master toplevel))
+           (buttons-frame (make-instance 'gui:frame :master toplevel))
            (delete-button (make-instance 'gui:button
-                                         :master  toplevel
+                                         :master  buttons-frame
                                          :image   icons:*document-delete*
                                          :command (delete-certificates-clsr table)))
            (import-button (make-instance 'gui:button
-                                         :master  toplevel
+                                         :master  buttons-frame
                                          :image   icons:*document-add*
                                          :command (import-certificates-clsr table))))
-      (gui:grid table         0 0 :sticky :news :columnspan 2)
-      (gui:grid delete-button 1 0 :sticky :w)
-      (gui:grid import-button 1 1 :sticky :w))))
+      (gui-goodies:attach-tooltips (delete-button (_ "delete selected certificates"))
+                                   (import-button (_ "import certificate form disk")))
+      (gui:grid table         0 0 :sticky :nwe)
+      (gui:grid buttons-frame 1 0 :sticky :s)
+      (gui:grid delete-button 0 0 :sticky :s)
+      (gui:grid import-button 0 1 :sticky :s))))
diff --git a/src/gui/client/json-rpc-communication.lisp b/src/gui/client/json-rpc-communication.lisp
index 7419193..58299c5 100644
--- a/src/gui/client/json-rpc-communication.lisp
+++ b/src/gui/client/json-rpc-communication.lisp
@@ -87,9 +87,8 @@
                    :code code
                    :data data
                    :text message))
-          (progn
-            (values (rpc:extract-results raw-response)
-                    raw-response))))))
+          (values (rpc:extract-results raw-response)
+                  raw-response)))))
 
 (defun close-server ()
   (make-request :quit-program 1))