Cleaned up article editor, in-progress fix for subforms (getting messy...)