fix redirect url after login
fix layout