Login popup + minor fixes 2