Login popup + minor fixes