Cleaned up editor for demo