More tweaks to user editing