Handle layout in req as well