layout changes

Signed-off-by: saschasigl <sascha.sigl@googlemail.com>