Did some refactoring, added in login.html