Add styling for question forms
Fix issue created by merge conflict