diff --git a/website/content/en/where.adoc b/website/content/en/where.adoc
--- a/website/content/en/where.adoc
+++ b/website/content/en/where.adoc
@@ -34,54 +34,124 @@
 [[download]]
 [[download-rel130]]
 == FreeBSD {rel130-current}-RELEASE
+Released {rel130-current-date}: _link:{u-rel130-announce}[Announcement] : link:{u-rel130-notes}[Release Notes] : link:{u-rel130-installation}[Installation Instructions] : link:{u-rel130-hardware}[Hardware Compatibility List] : link:{u-rel130-readme}[Readme] : link:{u-rel130-errata}[Errata] : link:{u-rel130-signatures}[Signed Checksums]_
+
 [.tblbasic]
 [.tblDownload]
-[width="100%",cols="25%,25%,25%,25%",options="header",]
+[width="100%",cols="40%,60%",options="header",]
 |===
-|Installer Images |Virtual Machine Images |SD Card Images |Documentation
+|Hardware Architecture     |Disk Image
 a|
-* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel130-current}/[amd64]
-* link:{url-rel}/i386/i386/ISO-IMAGES/{rel130-current}/[i386]
-* link:{url-rel}/powerpc/powerpc/ISO-IMAGES/{rel130-current}/[powerpc]
-* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel130-current}/[powerpc64]
-* link:{url-rel}/powerpc/powerpc64le/ISO-IMAGES/{rel130-current}/[powerpc64le]
-* link:{url-rel}/powerpc/powerpcspe/ISO-IMAGES/{rel130-current}/[powerpcspe]
-* link:{url-rel}/arm/armv6/ISO-IMAGES/{rel130-current}/[armv6]
-* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel130-current}/[armv7]
-* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[aarch64]
-* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/[riscv64]
+amd64
+
+Also called x86-64 - runs vast majority of PCs, laptops, and servers
 
 a|
-* link:{url-rel}/VM-IMAGES/README.txt[README]
-* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/amd64/Latest/[amd64]
-* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/i386/Latest/[i386]
-* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/aarch64/Latest/[aarch64]
-* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/riscv64/Latest/[riscv64]
+* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-amd64-memstick.img[Memory stick installer]
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/amd64/Latest/FreeBSD-{rel130-current}-RELEASE-amd64.qcow2.xz[qcow2] - VM image for Qemu and KVM
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/amd64/Latest/FreeBSD-{rel130-current}-RELEASE-amd64.raw.xz[raw] - VM image for bhyve(8)
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/amd64/Latest/FreeBSD-{rel130-current}-RELEASE-amd64.vhd.xz[VHD] - VM image for VirtualPC, Hyper-V, Xen, and VirtualBox
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/amd64/Latest/FreeBSD-{rel130-current}-RELEASE-amd64.vmdk.xz[VMDK] - VM image for VMWare
+
+{blank}
+
+* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel130-current}/[Other installer images]
 
 a|
-* aarch64
-* {blank}
-** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[PINE64]
-** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[PINE64-LTS]
-** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[ROCK64]
-** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[ROCKPRO64]
-** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[RPI] (3/4)
-* armv6/armv7
-* {blank}
-** link:{url-rel}/arm/armv7/ISO-IMAGES/{rel130-current}/[GENERICSD]
-** link:{url-rel}/arm/armv6/ISO-IMAGES/{rel130-current}/[RPI-B]
-* riscv64
-* {blank}
-** link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/[GENERICSD]
+aarch64
+
+ARM64 - embedded systems, single board computers, but also some servers and virtual machines
+
+a|
+* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-arm64-aarch64-memstick.img[Memory stick installer]
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/aarch64/Latest/FreeBSD-{rel130-current}-RELEASE-aarch64.qcow2.xz[qcow2] - VM image for Qemu and KVM
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/aarch64/Latest/FreeBSD-{rel130-current}-RELEASE-aarch64.raw.xz[raw] - VM image for bhyve(8)
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/aarch64/Latest/FreeBSD-{rel130-current}-RELEASE-aarch64.vmdk.xz[vmdk] - VM image for VMWare
+* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-arm64-aarch64-RPI.img.xz[Raspberry Pi 3/4 SD card image]
+
+{blank}
+
+* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[Other images]
+
+a|
+armv6
+
+32-bit ARM - older embedded systems and single board computers
+
+a|
+* link:{url-rel}/arm/armv6/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-arm-armv6-RPI-B.img.xz[Raspberry Pi B/Zero SD card image]
+
+{blank}
+
+* link:{url-rel}/arm/armv6/ISO-IMAGES/{rel130-current}/[Other images]
+
+a|
+armv7
+
+32-bit ARM - old embedded systems and single board computers
+
+a|
+* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-arm-armv7-GENERICSD.img.xz[Generic armv7 SD card image]
+
+{blank}
+
+* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel130-current}/[Other images]
+
+a|
+i386
+
+Older PCs
 
 a|
-* link:../releases/#current[Released]: {rel130-current-date}
-* link:{u-rel130-notes}[Release Notes]
-* link:{u-rel130-readme}[Readme]
-* link:{u-rel130-hardware}[Hardware Compatibility List]
-* link:{u-rel130-installation}[Installation Instructions]
-* link:{u-rel130-errata}[Errata]
-* link:{u-rel130-signatures}[Signed Checksums]
+* link:{url-rel}/i386/i386/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-i386-memstick.img[Memory stick installer]
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/i386/Latest/FreeBSD-{rel130-current}-RELEASE-i386.qcow2.xz[qcow2] - VM image for Qemu and KVM
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/i386/Latest/FreeBSD-{rel130-current}-RELEASE-i386.raw.xz[raw] - VM image for bhyve(8)
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/i386/Latest/FreeBSD-{rel130-current}-RELEASE-i386.vhd.xz[vhd] - VM image for VirtualPC, Hyper-V, Xen, and VirtualBox
+* link:{url-rel}/VM-IMAGES/{rel130-current}-RELEASE/i386/Latest/FreeBSD-{rel130-current}-RELEASE-i386.vmdk.xz[vmdk] - VM image for VMWare
+
+{blank}
+
+* link:{url-rel}/i386/i386/ISO-IMAGES/{rel130-current}/[Other installer images]
+
+a|
+powerpc64/powerpc64le
+
+IBM POWER 7/8/9 and Apple G5
+
+a|
+* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-powerpc-powerpc64-memstick.img[Memory stick installer] - big endian
+* link:{url-rel}/powerpc/powerpc64le/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-powerpc-powerpc64le-memstick.img[Memory stick installer] - little endian
+
+{blank}
+
+* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel130-current}/[Other big-endian images]
+* link:{url-rel}/powerpc/powerpc64le/ISO-IMAGES/{rel130-current}/[Other little-endian images]
+
+a|
+powerpc/powerpcspe
+
+Apple G3/G4 and embedded boards
+
+a|
+* link:{url-rel}/powerpc/powerpc/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-powerpc-memstick.img[Memory stick installer]
+
+{blank}
+
+* link:{url-rel}/powerpc/powerpc/ISO-IMAGES/{rel130-current}/[Other powerpc images]
+* link:{url-rel}/powerpc/powerpcspe/ISO-IMAGES/{rel130-current}/[Other powerpcspe images]
+
+a|
+riscv64
+
+RISC-V: The Free and Open RISC
+
+a|
+* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-riscv-riscv64-memstick.img[Memory stick installer]
+* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/FreeBSD-{rel130-current}-RELEASE-riscv-riscv64-GENERICSD.img.xz[SD card image]
+
+{blank}
+
+* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/[Other images]
 
 |===