Account model

- Cleaned up the account model
- Fixed a breadcrumbs issue