Fixed some of the box model issues