Large structural change. Make text as radio button itself.