Improve HTML structure for radio buttons