Add avatar for admin and code clean up