index improvement and minor menu change