alerts table collapsing
working on edit flow
Merge branch 'controller' into deployment