diff --git a/modules/sysadmin_guide/nav.adoc b/modules/sysadmin_guide/nav.adoc
index dfa2a65..4dc1f70 100644
--- a/modules/sysadmin_guide/nav.adoc
+++ b/modules/sysadmin_guide/nav.adoc
@@ -60,7 +60,7 @@
 ** xref:kickstarts.adoc[Kickstart Infrastructure - SOP]
 ** xref:koji.adoc[Koji Infrastructure - SOP]
 ** xref:koji-archive.adoc[Koji Archive - SOP]
-** xref:koji-builder-setup.adoc[koji-builder-setup - SOP in review ]
+** xref:koji-builder-setup.adoc[Setup Koji Builder - SOP]
 ** xref:koschei.adoc[koschei - SOP in review ]
 ** xref:layered-image-buildsys.adoc[layered-image-buildsys - SOP in review ]
 ** xref:librariesio2fedmsg.adoc[librariesio2fedmsg - SOP in review ]
diff --git a/modules/sysadmin_guide/pages/koji-builder-setup.adoc b/modules/sysadmin_guide/pages/koji-builder-setup.adoc
index cf935df..cff98b2 100644
--- a/modules/sysadmin_guide/pages/koji-builder-setup.adoc
+++ b/modules/sysadmin_guide/pages/koji-builder-setup.adoc
@@ -2,8 +2,10 @@
 
 == Contents
 
-* Setting up a new koji builder
-* Resetting/installing an old koji builder
+* <<_builder_setup>>
+** <<_network_overview>>
+** <<_setup_overview>>
+** <<_resettinginstalling_an_old_koji_builder>>
 
 == Builder Setup
 
@@ -13,17 +15,16 @@ Setting up a new koji builder involves a goodly number of steps:
 
 [arabic]
 . First get an instance spun up following the kickstart sop.
-. {blank}
-+
-Define a hostname for it on the 125 network and a $hostname-nfs name::
-  for it on the .127 network.
+. Define a hostname for it on the 125 network and a $hostname-nfs name
+for it on the .127 network.
 . make sure the instance has 2 network connections:
 * eth0 should be on the .125 network
 * eth1 should be on the .127 network
 +
-____
-For VM eth0 should be on br0, eth1 on br1 on the vmhost.
-____
+[NOTE]
+=====
+For VM _eth0_ should be on _br0_, _eth1_ on _br1_ on the vmhost.
+=====
 
 === Setup Overview
 
@@ -45,7 +46,7 @@ virt-install -n $builder_fqdn -r $memsize \
 * disable selinux on the machine in /etc/sysconfig/selinux
 * reboot
 * setup ssl cert into private/builders - use fqdn of host as DN
-** login to fas01 as root
+** login to _fas01_ as root
 ** `cd /var/lib/fedora-ca`
 ** `./kojicerthelper.py normal --outdir=/tmp/  \ --name=$fqdn_of_the_new_builder  --cadir=. --caname=Fedora`
 ** info for the cert should be like this:
@@ -59,7 +60,7 @@ Organizational Unit Name (eg, section) []:Fedora Builders
 Common Name (eg, your name or your servers hostname) []:$fqdn_of_new_builder
 Email Address []:buildsys@fedoraproject.org
 ....
-** scp the file in `/tmp/$\{fqdn}_key_and_cert.pem` over to batcave01
+** scp the file in `/tmp/$\{fqdn}_key_and_cert.pem` over to _batcave01_
 ** put file in the private repo under `private/builders/$dn}.pem`
 ** `git add` + `git commit`
 ** `git push`
@@ -75,7 +76,7 @@ koji add-host $fqdnr i386 x86_64
 === Resetting/installing an old koji builder
 
 * disable the builder in koji (ask a koji admin)
-* halt the old system (halt -p)
+* halt the old system (`halt -p`)
 * undefine the vm instance on the buildvmhost:
 +
 ....
@@ -111,8 +112,8 @@ virsh autostart $builder_fqdn
 ....
 * when the guest comes up
 ** login via ssh using the temp root password
-** python /root/tmp/setup-nfs-network.py
+** python `/root/tmp/setup-nfs-network.py`
 ** change root password
-** disable selinux in /etc/sysconfig/selinux
-** reboot
+** disable selinux in `/etc/sysconfig/selinux`
+** `reboot`
 ** ask a koji admin to re-enable the host