ckeditor fixes, template update