Fix bug with default layout