Fixing up account and user views