Fix selection boxes. Add radio button groups. Improve formatting.