fix login, fix navigation