Fixed the design for index