Do it with layouts. Make everybody happy.
Remove li since we're not using a list.
Use layouts for radio field. And there was much rejoicing.