Updates for layout

Signed-off-by: Ben Jackman <ben@jackman.biz>