add ckeditor + code tidying and ordering