Some UI fixes and preparation for CommonMark