fixed layout
Made index list more robust