Use :layout instead of :within and guarantee assigns are maps