Jesse/collab edit

Divij how does this break the setup_complete page? I pulled the branch and it seems to work fine...

Also some of this JS is getting messy. Divij are you taking ownership with the refactor? If so fine with this shipping.