New layout, updated functionality

Signed-off-by: Eric Eggert <ee@w3.org>