Fixed some rich text issues