Simplifying the editor and adding some eye-candy