-Moved the ckeditor config code to a more relevent file, and added a workable cancel button.

#926 and a bit of #932 (just the cancel part).