Added Login Form / Basic Code Refactoring