changed some things with login popup
Solved merge conflicts.