Fix init data structure
Board display fix