restructure application form, add hints and labels to questions