修改登录和注册

merge edwardzhou's login and hall ui changed