Fix views
Add avatar mixin