updated User
Fixed login/register choices and layouts