edit commands & UI

edit DGF
EDIT GC: -> CP (conflict)