Changed the add acount page
Fixed merge conficts