Layout changes

Signed-off-by: Thor Nahody <thor@nahody.com>