Actually completed log-in styling
Resolved conflict