Made the question/answer oage look perty
Fixed merge conflicts in show view