Login Work + bugs

Login Work and bug fixes