New design for the kit builder