Add missing keys and move some for GUI workflow

Loading
Loading