bug fix
mod avatars state
remove other templates