Survey stuff + clean up + removed age from patient pages