This commit also unifies layout structure
and remove no_container flag