Updated box model & fixed a few bugs