Add is_default for definition; overhaul and fix definition editing