Template updates for index and layout