Login cleanup and refresh button
more merging
merging
merging
more merging
merge