[Board] Layout improvements