diff --git a/src/app/(tools)/(domain)/whois/[domain]/page.tsx b/src/app/(tools)/(domain)/whois/[domain]/page.tsx
index 4751fa1..f3da198 100644
--- a/src/app/(tools)/(domain)/whois/[domain]/page.tsx
+++ b/src/app/(tools)/(domain)/whois/[domain]/page.tsx
@@ -98,7 +98,7 @@ export default async function WhoisLookupResultPage({
           </Link>
         );
       }
-      return <span className="break-all">{contact.email}</span>;
+      return <span className="break-all sm:break-normal">{contact.email}</span>;
     }
   });
 
@@ -132,22 +132,25 @@ export default async function WhoisLookupResultPage({
         ),
         Status: () => (
           <div className="flex flex-col gap-2 sm:flex-row">
-            {result.domain.status.map((status) => (
-              <Link
-                href={`https://www.icann.org/epp#${status}`}
-                className="w-fit"
-                target="_blank"
-                key={status}
-              >
-                <Badge
-                  className="-ml-[1px] border border-muted-foreground/25 shadow-sm hover:bg-muted"
-                  variant="outline"
+            {result.domain.status.map((s) => {
+              const status =
+                EPP_STATUS_CODES.find((c) => s === c.toLowerCase()) ?? s;
+              return (
+                <Link
+                  href={`https://www.icann.org/epp#${status}`}
+                  className="w-fit"
+                  target="_blank"
+                  key={status}
                 >
-                  {EPP_STATUS_CODES.find((c) => status === c.toLowerCase()) ??
-                    status}
-                </Badge>
-              </Link>
-            ))}
+                  <Badge
+                    className="-ml-[1px] border border-muted-foreground/25 shadow-sm hover:bg-muted-foreground/5"
+                    variant="outline"
+                  >
+                    {status}
+                  </Badge>
+                </Link>
+              );
+            })}
           </div>
         ),
         Nameservers: () => (
diff --git a/src/app/(tools)/ip/[ip]/page.tsx b/src/app/(tools)/ip/[ip]/page.tsx
index cbf0611..904e671 100644
--- a/src/app/(tools)/ip/[ip]/page.tsx
+++ b/src/app/(tools)/ip/[ip]/page.tsx
@@ -15,7 +15,7 @@ import {
 import { Table, TableBody, TableCell, TableRow } from '@/components/ui/table';
 import { CACHE_REVALIDATE_SECONDS } from '@/lib/config';
 import { TOOLS } from '@/lib/resources/tools';
-import { cn } from '@/lib/utils';
+import { capitalize, cn } from '@/lib/utils';
 import { api } from '@/trpc/server';
 import type { InfoTable } from '@/types';
 import { IPLookupForm } from '../form';
@@ -53,14 +53,19 @@ export default async function IPLookupResultPage({
   }
 
   const properties = Object.entries(result.properties).map(([key, value]) => ({
-    label: key === 'vpn' ? 'VPN' : key.charAt(0).toUpperCase() + key.slice(1),
+    label: key === 'vpn' ? 'VPN' : capitalize(key),
     value
   }));
 
   const table = {
     name: 'IP Address Information',
     keys: {
-      Hostname: () => result.hostname,
+      Hostname: () =>
+        result.hostname && (
+          <Link href={`/whois/${result.hostname}`} className="hover:underline">
+            {result.hostname}
+          </Link>
+        ),
       'Time Zone': () => result.location.timezone,
       Location: () =>
         result.location.city +
@@ -94,7 +99,7 @@ export default async function IPLookupResultPage({
             </p>
             <p className="text-xs">
               Type:{' '}
-              <span className="font-mono">{result.asn.type.toUpperCase()}</span>
+              <span className="font-mono">{capitalize(result.asn.type)}</span>
             </p>
             <p className="text-xs">
               ASN: <span className="font-mono">{result.asn.asn.slice(2)}</span>
@@ -125,7 +130,7 @@ export default async function IPLookupResultPage({
             <p className="text-xs">
               Type:{' '}
               <span className="font-mono">
-                {result.company.type.toUpperCase()}
+                {capitalize(result.company.type)}
               </span>
             </p>
           </>
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 39709ab..62e2860 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -6,6 +6,10 @@ export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
 
+export function capitalize(str: string) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
 export function parseDomain(hostname: string) {
   const result = _parseDomain(decodeURIComponent(hostname));
   return result.type === ParseResultType.Listed