More updates. Merge register and login pages