Add Question functionality; Question Generator dropdowns; Other code cleanup