Update default boxes; improve panel handling