Updated forms with radio button labels and better accessibility