Jesse/collab edit

Can you replace this so that we don't get the errors on the setup_complete page? Maybe even fix the Notes one while you're at it