Reworked demographics form