make registration and password pages prettier
merge conflict