Add layouts with bags
fix