diff --git a/dockercoins/webui/files/index.html b/dockercoins/webui/files/index.html
index 5ef4f4e6..473f71f7 100644
--- a/dockercoins/webui/files/index.html
+++ b/dockercoins/webui/files/index.html
@@ -50,7 +50,7 @@ function refresh () {
             points.push({ x: s2.now, y: speed });
         }
         $("#speed").text("~" + speed.toFixed(1) + " hashes/second");
-        var msg = ("I'm attending the @docker workshop at @neofonie, "
+        var msg = ("I'm attending the @docker workshop at @scaleconf, "
                    + "and my #DockerCoins mining rig is crunching "
                    + speed.toFixed(1) + " hashes/second! W00T!");
         $("#tweet").attr(
diff --git a/prepare-vms/settings/orchestration.yaml b/prepare-vms/settings/orchestration.yaml
index 14012588..d09ada88 100644
--- a/prepare-vms/settings/orchestration.yaml
+++ b/prepare-vms/settings/orchestration.yaml
@@ -8,7 +8,7 @@ instance_login: docker
 instance_password: training
 
 clustersize: 5  # Number of VMs per cluster
-pagesize: 15    # Number of cards to print per page
+pagesize: 12    # Number of cards to print per page
 
 #background_image: https://myapps.developer.ubuntu.com/site_media/appmedia/2014/12/swarm.png
 background_image: http://www.yellosoft.us/public/images/docker.png
diff --git a/www/htdocs/index.html b/www/htdocs/index.html
index bc4fdee9..6c8c13d4 100644
--- a/www/htdocs/index.html
+++ b/www/htdocs/index.html
@@ -169,6 +169,7 @@ grep '^# ' index.html | grep -v '<br' | tr '#' '-'^C
 
 - Docker for ops
 - Backups
+- Starting more containers from your container
 - Docker events stream
 - Attaching labels
 - Logs
@@ -184,18 +185,18 @@ grep '^# ' index.html | grep -v '<br' | tr '#' '-'^C
 - Hands-on Swarm
 - Deploying Swarm
 - Cluster discovery
-- Building our app on Swarm
+- Resource allocation
 - Connecting containers with ambassadors
 - Setting up Consul and overlay networks
 - Multi-host networking
-- Using overlay networks with Compose
-- Load balancing with overlay networks
+- Building images with Swarm
+- Deploying a local registry
+- Scaling workers
 
 ---
 
 ## Outline (4/4)
 
-- Here be dragons
 - Distributing Machine credentials
 - Highly available Swarm managers
 - Highly available containers