Layout changes

Signed-off-by: Karl Merkli <info@karl-merkli.ch>