Fixed some redirects with login
Resolved merge conflict
Fixed up issues with basic event crud