merging
Fixed styling and Login popup
merge
username or email