Replaced some views login, logout is working