Auth changes

Improved logic, some ui changes