Added index and layout