Board refactoring & improvement