Improve layout

Signed-off-by: Pekka Enberg <penberg@kernel.org>