refactoring and click callback on Board