Reworked some of the index sections