refactor templates for account page and add avatars