Fixed avatar thumbnail margins
Added handling default images
minor change