diff --git a/Makefile b/Makefile
index d51a752..d737343 100644
--- a/Makefile
+++ b/Makefile
@@ -71,4 +71,4 @@ endif
 	@sha256sum $(GOPATH)/bin/$(XBIN)
 
 run:
-	go run cmd/echoip/main.go -a data/asn.mmdb -c data/city.mmdb -f data/country.mmdb -H x-forwarded-for -r -s
+	go run cmd/echoip/main.go -a data/asn.mmdb -c data/city.mmdb -f data/country.mmdb -H x-forwarded-for -r -s -p
diff --git a/html/index.html b/html/index.html
index dc814ee..9557084 100644
--- a/html/index.html
+++ b/html/index.html
@@ -74,11 +74,11 @@
             <h2>What do we know about this IP address?</h2>
             <table class="info-table">
               <tr>
-                <th scope="row">IP address</th>
+                <th scope="row">IP&nbsp;address</th>
                 <td>{{ .IP }}</td>
               </tr>
               <tr>
-                <th scope="row">IP address (decimal)</th>
+                <th scope="row">IP&nbsp;address (decimal)</th>
                 <td>{{ .IPDecimal }}</td>
               </tr>
               {{ if .Country }}
@@ -103,7 +103,7 @@
               </tr>
               {{ end }} {{ if .RegionCode }}
               <tr>
-                <th scope="row">Region code</th>
+                <th scope="row">Region&nbsp;code</th>
                 <td>{{ .RegionCode }}</td>
               </tr>
               {{ end }} {{ if .MetroCode }}
@@ -113,7 +113,7 @@
               </tr>
               {{ end }} {{ if .PostalCode }}
               <tr>
-                <th scope="row">Postal code</th>
+                <th scope="row">Postal&nbsp;code</th>
                 <td>{{ .PostalCode }}</td>
               </tr>
               {{ end }} {{ if .City }}
@@ -153,17 +153,17 @@
               </tr>
               {{ end }} {{ if .UserAgent }} {{ if .UserAgent.Comment }}
               <tr>
-                <th scope="row">User agent</th>
+                <th scope="row">User&nbsp;agent</th>
                 <td>{{ .UserAgent.Product }}/{{ .UserAgent.Version }}</td>
               </tr>
               {{ end }} {{ if .UserAgent.Comment }}
               <tr>
-                <th scope="row">User agent: Comment</th>
+                <th scope="row">User&nbsp;agent: Comment</th>
                 <td>{{ .UserAgent.Comment }}</td>
               </tr>
               {{ end }} {{ if .UserAgent.RawValue }}
               <tr>
-                <th scope="row">User agent: Raw</th>
+                <th scope="row">User&nbsp;agent: Raw</th>
                 <td>{{ .UserAgent.RawValue }}</td>
               </tr>
               {{ end }} {{ end }}
@@ -200,52 +200,52 @@
             </p>
             <div class="pure-form">
               <!-- COMMAND WIDGET -->
-              <div class="buttons">
+              <div class="input-buttons">
                 <button
                   name="ip"
-                  class="button widget-select"
+                  class="pure-button widget-select"
                   onclick="changeInput(this.name, this)"
                 >
                   ip
                 </button>
                 <button
                   name="country"
-                  class="button widget-select"
+                  class="pure-button widget-select"
                   onclick="changeInput(this.name, this)"
                 >
                   country
                 </button>
                 <button
                   name="country-iso"
-                  class="button widget-select"
+                  class="pure-button widget-select"
                   onclick="changeInput(this.name, this)"
                 >
                   country-iso
                 </button>
                 <button
                   name="city"
-                  class="button widget-select"
+                  class="pure-button widget-select"
                   onclick="changeInput(this.name, this)"
                 >
                   city
                 </button>
                 <button
                   name="asn"
-                  class="button widget-select"
+                  class="pure-button widget-select"
                   onclick="changeInput(this.name, this)"
                 >
                   asn
                 </button>
                 <button
                   name="json"
-                  class="button widget-select"
+                  class="pure-button widget-select"
                   onclick="changeInput(this.name, this)"
                 >
                   json
                 </button>
                 <button
                   name="port"
-                  class="button widget-select"
+                  class="pure-button widget-select"
                   onclick="changeInput(this.name, this)"
                 >
                   port
@@ -266,12 +266,13 @@
               </div>
               <div id="output" class="widgetbox output"></div>
 
-              <form class="pure-form">
+              <form class="pure-form input-buttons">
                 <fieldset>
-                  <label for="ipCheckBox">
+                  <label for="ipInput">
+                    Check another IP (optional)
                     <input
                       id="ipInput"
-                      class="medium-input pure-input"
+                      class=""
                       type="text"
                       placeholder="IP to query"
                       onkeyup="updateIP(this.value)"
diff --git a/html/script.html b/html/script.html
index 1e4b7f8..cd57f8d 100644
--- a/html/script.html
+++ b/html/script.html
@@ -71,7 +71,6 @@
   function navigate(event) {
     console.log("navigate", compositePath)
     window.location = compositePath
-    event.preventDefault()
   }
 
   function updatePort(value) {
diff --git a/html/styles.html b/html/styles.html
index e2cd974..bc0725f 100644
--- a/html/styles.html
+++ b/html/styles.html
@@ -26,6 +26,7 @@
     background: #f2f2f2;
     font-size: 36px;
     padding: 6px;
+    word-wrap: break-word;
   }
   svg.github-corner {
     fill: #151513;
@@ -52,12 +53,12 @@
   .info-table th {
     padding: 5px;
     border: 2px solid #ababab;
+    word-wrap: break-word;
   }
 
   .info-table th[scope="row"] {
     background-color: #d5d5d5;
     text-align: left;
-    white-space: nowrap;
   }
 
   .widgetbox {
@@ -88,11 +89,6 @@
     text-align: right;
   }
 
-  .narrow-input {
-    width: 5.5em;
-    margin-top: 0.2em;
-  }
-
   .medium-input {
     width: 10em;
   }
@@ -101,6 +97,11 @@
     background-color: rgb(208 208 208);
   }
 
+  .input-buttons {
+    line-height: 2.6em;
+    font-size: smaller;
+  }
+
   /* POST CORRECTION */
   .leafcloud-logo .letters {
     fill: black;
@@ -113,7 +114,6 @@
     a {
       background-color: #161719;
       color: #d8d9da;
-      /* text-decoration: underline; */
     }
     .ip {
       border: 1px solid #313233;
@@ -137,13 +137,13 @@
       background-color: #2e2e2e;
       color: rgb(220, 220, 220);
       text-align: left;
-      white-space: nowrap;
     }
 
-    button {
+    .pure-button {
       background-color: #2e2e2e;
+      color: rgb(220, 220, 220);
     }
-    button.selected {
+    .pure-button.selected {
       background-color: rgb(125 125 125);
     }