integrate user and login page
update js structure