CardIndex 2.3

Fixed bugs. Code refactoring