Final fixes to board layouts