BUG board widths fixed
merge conflict