Fix question numbering bugs for instrument creation interface