Small tweaks, thinking about ditching the core service provider
Moving stuff around, added CKEeditor