Pooja/Melanie | #3256 | Fixing misplaced error messages on questionnaire page