Updated to give each question type a table