Canvas: Improved Rich Content Editor, Miscellaneous Bug Fixes