This changeset now matches plan-b commit 609a0041
This also splits the templates into two: index and tray, since the URL now changes.