Add titled group labels to questions

Required by athlete education extra questions
Fix spacing after adding labels
Removed unused method