Added a better way to handle box sizing