Refactored first identity page