Modified index and layout files