Better box model reset

A more complete reset on box model.
Works with older code and new.