The box is back

Box is back
Cleaned up some code in Thumb