Login popup

Prep Merge to change coding style.