Make login page prettier plus correct minor html tags; start working on register page.
Resolve merge conflict.