fixed some edit features for flows and terminals
updating terminals
Merge branch 'controller' into deployment