Index Redo

Redesign