Changes to index and layout