Add resolve layouts to resolve-y controllers for error rendering and clean up white space.