Simplifying the editor and adding some eye-candy
Merge pull request #1 from lodr/simple-editor

Simplifying the editor and adding some eye-candy