infoboard added, some code refactoring
Refactore some code, Infoboard added