integrating login & register2
minor fixes
updated form