fix missing csrf token
fix broken popup after design changes
Change route names

Two tests broken for unresolved reasons.