better data-states and new question page