clean up code and add username and password login;
update translations;