Improved answer template scrolling by moving it into the question template