indexes and layout fixes