Improved layout for FAQ comments, closes #625