Styled answers page
Fix merge conflicts