Add extra fields and box for the generic guide #10700