fix width of boxes
Merge branch 'matt_dev' into dev