Fix and refactoring index commits and commits highlight