Updated index and layout