Refactor and nicer board trail