Update layout

Signed-off-by: Guangliang Zhao <gzhao@suse.com>