Added the login/signup to the new view.
Resolved the conflicts.