Changed .layout format