added layout id and content wrapper