Updated layout and index