first attempt to use the new design
adding user login logic