Updated Board to be more elegant