UI Cleanup
Added avatars