Fixed several bugs with content editor