Improvements to Live Edit Mode (from last commit)