login/logout fixed, angular stuff added