Refactored, better auth UI