Fix some line breaks and misc markup issues