Refactor Config Boxes