Change some names
Add some design for account pages