Adds box sizing in an attempt to fix ticket DT-2031