Layout changes
Avatar refactoring
Update user profile - avatar change tests