Fix sizing issues with avatars on different size devices.

[FIXED]     Avatar cells badly sized on some size devices.
Fixes for positioning of avatars in different states.