Fix avatar bug and cleanup assets