Move index to layout system