The layout in this next prototype is complicated enough that I finally got around to some automatic layout.