Unify survey styling

Un-nest hand coded related questions. Use same styling for all question
labels. Change some "text" questions to "number" type.