Refactor of BoardView