Fix BuilderPanel