new classes added, refactoring, cell icon added