Updated layout

Signed-off-by: David Kerns <david@kerns.dk>