Added layout, modified index to use layout