Fixed login problem added login view
Merged