Added login popup
Fixed login popup
new layout
Finish
merge e