updated login
changes merge
updated html