refactoring; integrated login view