Added an index parameter to layout section