Edits to layout helpers