css register and popup login
fix merge
fix and popup html