Remove options table, add levels to questions