Add some support for my default layout