adding support for default layouts