Refactored auth views