Enhance box container creation/display

Also perform a bit of refactoring