More refactoring in `cs\Index` and `cs\Page`