Issue #29: Made edit mode preferences persistent