Refactor to have current board showing