Cleaned up the editing experience