lots of changes including adding ck editor