Changed routes back to old style to avoid current complications
Adjusted redirect for logged in users to avoid bug