Design changes for base user and adding email functionality